diff options
| author | rdivacky <rdivacky@FreeBSD.org> | 2009-09-22 16:28:07 +0000 |
|---|---|---|
| committer | rdivacky <rdivacky@FreeBSD.org> | 2009-09-22 16:28:07 +0000 |
| commit | 28435a4f3664401249e27c20b6d9632cd427cef7 (patch) | |
| tree | c820078f74f6210e3e18786d7a625559414e2c04 | |
| parent | f3b70d313ab348c74bf01a805b66dcbfc8a54965 (diff) | |
| download | FreeBSD-src-28435a4f3664401249e27c20b6d9632cd427cef7.zip FreeBSD-src-28435a4f3664401249e27c20b6d9632cd427cef7.tar.gz | |
Change the command argument to ioctl routines to u_long to avoid
truncating the command to 32bit on 64bit archs where int is 32bit
(ie. amd64).
Approved by: scottl
Approved by: ed (mentor, implicit)
| -rw-r--r-- | sys/dev/twa/tw_cl_io.c | 2 | ||||
| -rw-r--r-- | sys/dev/twa/tw_cl_share.h | 2 | ||||
| -rw-r--r-- | sys/dev/twe/twe.c | 2 | ||||
| -rw-r--r-- | sys/dev/twe/twevar.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/twa/tw_cl_io.c b/sys/dev/twa/tw_cl_io.c index 162b1ea..6fea175 100644 --- a/sys/dev/twa/tw_cl_io.c +++ b/sys/dev/twa/tw_cl_io.c @@ -396,7 +396,7 @@ tw_cl_fw_passthru(struct tw_cl_ctlr_handle *ctlr_handle, * non-zero-- failure */ TW_INT32 -tw_cl_ioctl(struct tw_cl_ctlr_handle *ctlr_handle, TW_INT32 cmd, TW_VOID *buf) +tw_cl_ioctl(struct tw_cl_ctlr_handle *ctlr_handle, u_long cmd, TW_VOID *buf) { struct tw_cli_ctlr_context *ctlr = (struct tw_cli_ctlr_context *)(ctlr_handle->cl_ctlr_ctxt); diff --git a/sys/dev/twa/tw_cl_share.h b/sys/dev/twa/tw_cl_share.h index 265ff77..e583818 100644 --- a/sys/dev/twa/tw_cl_share.h +++ b/sys/dev/twa/tw_cl_share.h @@ -565,7 +565,7 @@ extern TW_INT32 tw_cl_interrupt(struct tw_cl_ctlr_handle *ctlr_handle); /* CL's ioctl handler. */ extern TW_INT32 tw_cl_ioctl(struct tw_cl_ctlr_handle *ctlr_handle, - TW_INT32 cmd, TW_VOID *buf); + u_long cmd, TW_VOID *buf); #ifdef TW_OSL_DEBUG diff --git a/sys/dev/twe/twe.c b/sys/dev/twe/twe.c index 59b5027..90dfa2e 100644 --- a/sys/dev/twe/twe.c +++ b/sys/dev/twe/twe.c @@ -487,7 +487,7 @@ twe_dump_blocks(struct twe_softc *sc, int unit, u_int32_t lba, void *data, int n * Handle controller-specific control operations. */ int -twe_ioctl(struct twe_softc *sc, int ioctlcmd, void *addr) +twe_ioctl(struct twe_softc *sc, u_long ioctlcmd, void *addr) { struct twe_usercommand *tu = (struct twe_usercommand *)addr; struct twe_paramcommand *tp = (struct twe_paramcommand *)addr; diff --git a/sys/dev/twe/twevar.h b/sys/dev/twe/twevar.h index 90391ad..2711ccc 100644 --- a/sys/dev/twe/twevar.h +++ b/sys/dev/twe/twevar.h @@ -150,7 +150,7 @@ extern void twe_startio(struct twe_softc *sc); extern int twe_start(struct twe_request *tr); extern int twe_dump_blocks(struct twe_softc *sc, int unit, /* crashdump block write */ u_int32_t lba, void *data, int nblks); -extern int twe_ioctl(struct twe_softc *sc, int cmd, +extern int twe_ioctl(struct twe_softc *sc, u_long cmd, void *addr); /* handle user request */ extern void twe_describe_controller(struct twe_softc *sc); /* print controller info */ extern void twe_print_controller(struct twe_softc *sc); |
