oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IOCTL requests are unsigned longs now

Browse Source 
Issue reported by JD Begin.

Change-Id: I0306d9dc43c36107897c8b73ed340d86a8dcef27
This commit is contained in:
David van Moolenbroek 2014-09-29 15:11:01 +00:00
parent e3fd605f72
commit 63ce03db66
6 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
minix/drivers/storage/fbd/rule.c
View File

@ -12,7 +12,7 @@ static int nr_matches;
/*===========================================================================* /*===========================================================================*
* rule_ctl * * rule_ctl *
*===========================================================================*/ *===========================================================================*/
int rule_ctl(int request, endpoint_t endpt, cp_grant_id_t grant) int rule_ctl(unsigned long request, endpoint_t endpt, cp_grant_id_t grant)
{ {
/* Handle an I/O control request regarding rules. */ /* Handle an I/O control request regarding rules. */
fbd_rulenum_t i; fbd_rulenum_t i;

3
minix/drivers/storage/fbd/rule.h
View File

@ -3,7 +3,8 @@
#define MAX_RULES 16 #define MAX_RULES 16
extern int rule_ctl(int request, endpoint_t endpt, cp_grant_id_t grant); extern int rule_ctl(unsigned long request, endpoint_t endpt,
cp_grant_id_t grant);
extern int rule_find(u64_t pos, size_t size, int flag); extern int rule_find(u64_t pos, size_t size, int flag);

4
minix/include/minix/bdev.h
View File

@ -16,7 +16,7 @@ extern ssize_t bdev_gather(dev_t dev, u64_t pos, iovec_t *vec, int count,
int flags); int flags);
extern ssize_t bdev_scatter(dev_t dev, u64_t pos, iovec_t *vec, int count, extern ssize_t bdev_scatter(dev_t dev, u64_t pos, iovec_t *vec, int count,
int flags); int flags);
extern int bdev_ioctl(dev_t dev, int request, void *buf, extern int bdev_ioctl(dev_t dev, unsigned long request, void *buf,
endpoint_t user_endpt); endpoint_t user_endpt);
/* Asynchronous API. */ /* Asynchronous API. */
@ -36,7 +36,7 @@ extern bdev_id_t bdev_gather_asyn(dev_t dev, u64_t pos, iovec_t *vec,
int count, int flags, bdev_callback_t callback, bdev_param_t param); int count, int flags, bdev_callback_t callback, bdev_param_t param);
extern bdev_id_t bdev_scatter_asyn(dev_t dev, u64_t pos, iovec_t *vec, extern bdev_id_t bdev_scatter_asyn(dev_t dev, u64_t pos, iovec_t *vec,
int count, int flags, bdev_callback_t callback, bdev_param_t param); int count, int flags, bdev_callback_t callback, bdev_param_t param);
extern bdev_id_t bdev_ioctl_asyn(dev_t dev, int request, void *buf, extern bdev_id_t bdev_ioctl_asyn(dev_t dev, unsigned long request, void *buf,
endpoint_t user_endpt, bdev_callback_t callback, bdev_param_t param); endpoint_t user_endpt, bdev_callback_t callback, bdev_param_t param);
extern int bdev_wait_asyn(bdev_id_t id); extern int bdev_wait_asyn(bdev_id_t id);

4
minix/include/minix/ipc.h
View File

@ -345,7 +345,7 @@ typedef struct {
int flags; int flags;
endpoint_t user; endpoint_t user;
int request; unsigned long request;
uint8_t padding[16]; uint8_t padding[16];
} mess_lbdev_lblockdriver_msg; } mess_lbdev_lblockdriver_msg;
@ -1958,7 +1958,7 @@ typedef struct {
off_t pos; off_t pos;
cp_grant_id_t grant; cp_grant_id_t grant;
size_t count; size_t count;
int request; unsigned long request;
int flags; int flags;
endpoint_t id; endpoint_t id;
endpoint_t user; endpoint_t user;

7
minix/lib/libbdev/bdev.c
View File

@ -303,7 +303,7 @@ ssize_t bdev_scatter(dev_t dev, u64_t pos, iovec_t *vec, int count, int flags)
return bdev_vrdwt(BDEV_SCATTER, dev, pos, vec, count, flags); return bdev_vrdwt(BDEV_SCATTER, dev, pos, vec, count, flags);
} }
static int bdev_ioctl_setup(dev_t dev, int request, void *buf, static int bdev_ioctl_setup(dev_t dev, unsigned long request, void *buf,
endpoint_t user_endpt, message *m) endpoint_t user_endpt, message *m)
{ {
/* Set up an I/O control request. /* Set up an I/O control request.
@ -351,7 +351,8 @@ static void bdev_ioctl_cleanup(const message *m)
cpf_revoke(m->m_lbdev_lblockdriver_msg.grant); cpf_revoke(m->m_lbdev_lblockdriver_msg.grant);
} }
int bdev_ioctl(dev_t dev, int request, void *buf, endpoint_t user_endpt) int bdev_ioctl(dev_t dev, unsigned long request, void *buf,
endpoint_t user_endpt)
{ {
/* Perform a synchronous I/O control request. /* Perform a synchronous I/O control request.
*/ */
@ -495,7 +496,7 @@ bdev_id_t bdev_scatter_asyn(dev_t dev, u64_t pos, iovec_t *vec, int count,
param); param);
} }
bdev_id_t bdev_ioctl_asyn(dev_t dev, int request, void *buf, bdev_id_t bdev_ioctl_asyn(dev_t dev, unsigned long request, void *buf,
endpoint_t user_endpt, bdev_callback_t callback, bdev_param_t param) endpoint_t user_endpt, bdev_callback_t callback, bdev_param_t param)
{ {
/* Perform an asynchronous I/O control request. /* Perform an asynchronous I/O control request.

2
minix/tests/blocktest/blocktest.c
View File

@ -1152,7 +1152,7 @@ static void close_device(dev_t minor)
"closing a subpartition"); "closing a subpartition");
} }
static int vir_ioctl(dev_t minor, int req, void *ptr, ssize_t exp, static int vir_ioctl(dev_t minor, unsigned long req, void *ptr, ssize_t exp,
result_t *res) result_t *res)
{ {
/* Perform an I/O control request, using a local buffer. /* Perform an I/O control request, using a local buffer.