diff options
| -rw-r--r-- | sys/scsi/sd.c | 11 | ||||
| -rw-r--r-- | sys/scsi/st.c | 20 |
2 files changed, 22 insertions, 9 deletions
diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c index dd92861..a86a2cb 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 1.77 1995/12/08 23:22:25 phk Exp $ + * $Id: sd.c,v 1.78 1995/12/09 20:42:35 phk Exp $ */ #define SPLSD splbio @@ -45,6 +45,8 @@ #include <machine/md_var.h> #include <i386/i386/cons.h> /* XXX *//* for aborting dump */ +extern int SCSI_DEVICE_ENTRIES __P((int sd)); + static u_int32 sdstrats, sdqueues; #define SECSIZE 512 @@ -60,6 +62,8 @@ static u_int32 sdstrats, sdqueues; makedev(major(DEV), dkmakeminor((U), dkslice(DEV), dkpart(DEV))) static errval sd_get_parms __P((int unit, int flags)); +static errval sd_reassign_blocks __P((int unit, int block)); +static u_int32 sd_size __P((int unit, int flags)); static void sdstrategy1 __P((struct buf *)); static int sd_sense_handler __P((struct scsi_xfer *)); @@ -183,11 +187,14 @@ sd_registerdev(int unit) * The routine called by the low level scsi routine when it discovers * a device suitable for this driver. */ -errval +static errval sdattach(struct scsi_link *sc_link) { u_int32 unit; struct disk_parms *dp; +#ifdef DEVFS + char name[32]; +#endif struct scsi_data *sd = sc_link->sd; diff --git a/sys/scsi/st.c b/sys/scsi/st.c index 782b768..521d907 100644 --- a/sys/scsi/st.c +++ b/sys/scsi/st.c @@ -12,7 +12,7 @@ * on the understanding that TFS is not responsible for the correct * functioning of this software in any circumstances. * - * $Id: st.c,v 1.50 1995/12/08 23:22:28 phk Exp $ + * $Id: st.c,v 1.51 1995/12/09 20:42:38 phk Exp $ */ /* @@ -163,6 +163,8 @@ static errval st_erase __P((u_int32 unit, boolean immed, u_int32 flags)); static errval st_mode_sense __P((u_int32 unit, u_int32 flags, \ struct tape_pages *page, u_int32 pagelen, u_int32 pagecode)); static errval st_decide_mode __P((u_int32 unit, boolean first_read)); +static errval st_read __P((u_int32 unit, char *buf, u_int32 size, + u_int32 flags)); static errval st_rd_blk_lim __P((u_int32 unit, u_int32 flags)); static errval st_touch_tape __P((u_int32 unit)); static errval st_write_filemarks __P((u_int32 unit, int32 number, u_int32 flags)); @@ -170,15 +172,16 @@ static errval st_load __P((u_int32 unit, u_int32 type, u_int32 flags)); static errval st_mode_select __P((u_int32 unit, u_int32 flags, \ struct tape_pages *page, u_int32 pagelen)); static errval st_comp __P((u_int32 unit, u_int32 mode)); -static int32 st_chkeod(); +static int32 st_chkeod __P((u_int32 unit, boolean position, int32 *nmarks, + u_int32 flags)); static void ststart(u_int32 unit, u_int32 flags); -static void st_unmount(); -static errval st_mount_tape(); -static void st_loadquirks(); +static void st_unmount __P((int unit, boolean eject)); +static errval st_mount_tape __P((dev_t dev, u_int32 flags)); +static void st_loadquirks __P((struct scsi_link *sc_link)); #ifndef NEW_SCSICONF -static void st_identify_drive(); +static void st_identify_drive __P((u_int32 unit)); #endif -static errval st_interpret_sense(); +static errval st_interpret_sense __P((struct scsi_xfer *xs)); #define ESUCCESS 0 #define NOEJECT 0 @@ -365,6 +368,9 @@ static errval stattach(struct scsi_link *sc_link) { u_int32 unit; +#ifdef DEVFS + char name[32]; +#endif struct scsi_data *st = sc_link->sd; |
