diff options
Diffstat (limited to 'sys/scsi')
| -rw-r--r-- | sys/scsi/cd.c | 13 | ||||
| -rw-r--r-- | sys/scsi/ch.c | 10 | ||||
| -rw-r--r-- | sys/scsi/scsi_ioctl.c | 6 | ||||
| -rw-r--r-- | sys/scsi/sd.c | 12 | ||||
| -rw-r--r-- | sys/scsi/uk.c | 9 |
5 files changed, 33 insertions, 17 deletions
diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c index 68b09ba..46e9e3b 100644 --- a/sys/scsi/cd.c +++ b/sys/scsi/cd.c @@ -14,7 +14,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $Id: cd.c,v 2.3 93/10/11 11:49:49 julian Exp Locker: julian $ + * $Id: cd.c,v 1.12 1993/11/18 05:02:46 rgrimes Exp $ */ #define SPLCD splbio @@ -200,6 +200,7 @@ cdattach(sc_link) */ errval cdopen(dev) + dev_t dev; { errval errcode = 0; u_int32 unit, part; @@ -424,7 +425,7 @@ cdstrategy(bp) cdstart(unit); splx(opri); - return; + return 0; /* XXX ??? is this the right return? */ bad: bp->b_flags |= B_ERROR; done: @@ -915,6 +916,8 @@ cdgetdisklabel(unit) */ u_int32 cd_size(unit, flags) + int unit; + int flags; { struct scsi_read_cd_cap_data rdcap; struct scsi_read_cd_capacity scsi_cmd; @@ -1183,8 +1186,10 @@ cd_reset(unit) */ errval cd_read_subchannel(unit, mode, format, track, data, len) - u_int32 unit, mode, format, len; + u_int32 unit, mode, format; + int track; struct cd_sub_channel_info *data; + u_int32 len; { struct scsi_read_subchannel scsi_cmd; errval error; @@ -1253,6 +1258,8 @@ cd_read_toc(unit, mode, start, data, len) */ errval cd_get_parms(unit, flags) + int unit; + int flags; { struct cd_data *cd = cd_driver.cd_data[unit]; diff --git a/sys/scsi/ch.c b/sys/scsi/ch.c index c403fe5..fd7b1eb 100644 --- a/sys/scsi/ch.c +++ b/sys/scsi/ch.c @@ -2,7 +2,7 @@ * Written by grefen@????? * Based on scsi drivers by Julian Elischer (julian@tfs.com) * - * $Id: ch.c,v 2.2 93/10/16 00:58:30 julian Exp Locker: julian $ + * $Id: ch.c,v 1.5 1993/11/18 05:02:48 rgrimes Exp $ */ #include <sys/types.h> @@ -115,8 +115,8 @@ chattach(sc_link) } ch_data[unit].initialized = 1; - return; - + return 1; + /* XXX ??? is this the right return val? */ } /* @@ -124,6 +124,7 @@ chattach(sc_link) */ errval chopen(dev) + dev_t dev; { errval errcode = 0; u_int32 unit, mode; @@ -189,6 +190,7 @@ chopen(dev) */ errval chclose(dev) + dev_t dev; { unsigned char unit, mode; struct scsi_link *sc_link; @@ -212,6 +214,7 @@ chioctl(dev, cmd, arg, mode) dev_t dev; u_int32 cmd; caddr_t arg; + int mode; { /* struct ch_cmd_buf *args; */ union scsi_cmd *scsi_cmd; @@ -275,6 +278,7 @@ chioctl(dev, cmd, arg, mode) errval ch_getelem(unit, stat, type, from, data, flags) u_int32 unit, from, flags; + int type; short *stat; char *data; { diff --git a/sys/scsi/scsi_ioctl.c b/sys/scsi/scsi_ioctl.c index c1b576d..0e50b49 100644 --- a/sys/scsi/scsi_ioctl.c +++ b/sys/scsi/scsi_ioctl.c @@ -20,6 +20,7 @@ #include <scsi/scsiconf.h> #include <sys/scsiio.h> +void scsierr(struct buf *, int); /* XXX ??? */ /* * We let the user interpret his own sense in the generic scsi world. @@ -317,9 +318,10 @@ errval scsi_do_ioctl(struct scsi_link *sc_link, int cmd, caddr_t addr, int f) return ret; } +void scsierr(bp,err) -struct buf *bp; -int err; + struct buf *bp; + int err; { bp->b_flags |= B_ERROR; bp->b_error = err; diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c index b3320aa3..660d194 100644 --- a/sys/scsi/sd.c +++ b/sys/scsi/sd.c @@ -14,7 +14,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@dialix.oz.au) Sept 1992 * - * $Id: sd.c,v 2.7 93/10/24 12:44:40 julian Exp Locker: julian $ + * $Id: sd.c,v 1.12 1993/11/18 05:03:02 rgrimes Exp $ */ #define SPLSD splbio @@ -72,8 +72,8 @@ int Debugger(); errval sdgetdisklabel __P((unsigned char unit)); errval sd_get_parms __P((int unit, int flags)); -errval sdstrategy(); -void sdstart(); +void sdstrategy __P((struct buf *)); +void sdstart __P((u_int32)); struct scsi_device sd_switch = { @@ -358,7 +358,7 @@ sdminphys(bp) * can understand. The transfer is described by a buf and will include * only one physical transfer. */ -errval +void sdstrategy(bp) struct buf *bp; { @@ -427,7 +427,7 @@ sdstrategy(bp) sdstart(unit); splx(opri); - return 0; + return /*0*/; bad: bp->b_flags |= B_ERROR; done: @@ -437,7 +437,7 @@ done: */ bp->b_resid = bp->b_bcount; biodone(bp); - return 0; + return /*0*/; } /* diff --git a/sys/scsi/uk.c b/sys/scsi/uk.c index 5c48d01..b503593 100644 --- a/sys/scsi/uk.c +++ b/sys/scsi/uk.c @@ -2,7 +2,7 @@ * Dummy driver for a device we can't identify. * by Julian Elischer (julian@tfs.com) * - * $Id: uk.c,v 1.2 93/10/11 11:53:28 julian Exp Locker: julian $ + * $Id: uk.c,v 1.1 1993/11/18 05:03:13 rgrimes Exp $ */ @@ -68,7 +68,7 @@ ukattach(sc_link) printf("uk%d: unknown device\n", unit); uk_data[unit].flags = UK_KNOWN; - return; + return 1; /* XXX ??? */ } @@ -77,6 +77,7 @@ ukattach(sc_link) */ errval ukopen(dev) + dev_t dev; { errval errcode = 0; u_int32 unit, mode; @@ -122,8 +123,9 @@ ukopen(dev) */ errval ukclose(dev) + dev_t dev; { - unsigned char unit, mode; + unsigned char unit = 0, mode; /* XXX !!! XXX FIXME!!! 0??? */ struct scsi_link *sc_link; sc_link = uk_data[unit].sc_link; @@ -142,6 +144,7 @@ ukioctl(dev, cmd, arg, mode) dev_t dev; u_int32 cmd; caddr_t arg; + int mode; { unsigned char unit; struct scsi_link *sc_link; |
