diff options
author | phk <phk@FreeBSD.org> | 1995-10-21 23:13:11 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 1995-10-21 23:13:11 +0000 |
commit | e08396dc86e00f8195493fa64dd1ba477891a68f (patch) | |
tree | 2da6eefc771916d956b2fb793615b329164a362f /sys/scsi | |
parent | ec905d38f8ed7b9a1d83f4c2a6eca88f6860b59e (diff) | |
download | FreeBSD-src-e08396dc86e00f8195493fa64dd1ba477891a68f.zip FreeBSD-src-e08396dc86e00f8195493fa64dd1ba477891a68f.tar.gz |
Make a lot of things static.
Diffstat (limited to 'sys/scsi')
-rw-r--r-- | sys/scsi/cd.c | 24 | ||||
-rw-r--r-- | sys/scsi/scsiconf.h | 6 | ||||
-rw-r--r-- | sys/scsi/sd.c | 24 | ||||
-rw-r--r-- | sys/scsi/st.c | 52 | ||||
-rw-r--r-- | sys/scsi/worm.c | 26 |
5 files changed, 66 insertions, 66 deletions
diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c index 550b5da..7fd4965 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 1.40 1995/05/03 18:09:06 dufault Exp $ + * $Id: cd.c,v 1.41 1995/05/30 08:13:20 rgrimes Exp $ */ #define SPLCD splbio @@ -69,7 +69,7 @@ int32 cdstrats, cdqueues; #define PARTITION(z) (minor(z) & 0x07) #define RAW_PART 2 -void cdstart(u_int32 unit, u_int32 flags); +static void cdstart(u_int32 unit, u_int32 flags); struct scsi_data { u_int32 flags; @@ -90,17 +90,17 @@ struct scsi_data { static int cdunit(dev_t dev) { return CDUNIT(dev); } static dev_t cdsetunit(dev_t dev, int unit) { return CDSETUNIT(dev, unit); } -errval cd_open(dev_t dev, int flags, int fmt, struct proc *p, -struct scsi_link *sc_link); -errval cd_ioctl(dev_t dev, int cmd, caddr_t addr, int flag, +static errval cd_open(dev_t dev, int flags, int fmt, struct proc *p, + struct scsi_link *sc_link); +static errval cd_ioctl(dev_t dev, int cmd, caddr_t addr, int flag, struct proc *p, struct scsi_link *sc_link); -errval cd_close(dev_t dev, int flag, int fmt, struct proc *p, - struct scsi_link *sc_link); -void cd_strategy(struct buf *bp, struct scsi_link *sc_link); +static errval cd_close(dev_t dev, int flag, int fmt, struct proc *p, + struct scsi_link *sc_link); +static void cd_strategy(struct buf *bp, struct scsi_link *sc_link); SCSI_DEVICE_ENTRIES(cd) -struct scsi_device cd_switch = +static struct scsi_device cd_switch = { NULL, /* use default error handler */ cdstart, /* we have a queue, which is started by this */ @@ -170,7 +170,7 @@ cd_registerdev(int unit) * The routine called by the low level scsi routine when it discovers * A device suitable for this driver */ -int +static int cdattach(struct scsi_link *sc_link) { u_int32 unit; @@ -940,7 +940,7 @@ cd_getdisklabel(unit) /* * Find out from the device what it's capacity is */ -u_int32 +static u_int32 cd_size(unit, flags) int unit; int flags; @@ -1080,7 +1080,7 @@ cd_play(unit, blk, len) /* * Get scsi driver to send a "start playing" command */ -errval +static errval cd_play_big(unit, blk, len) u_int32 unit, blk, len; { diff --git a/sys/scsi/scsiconf.h b/sys/scsi/scsiconf.h index 5de3857..74e59c1 100644 --- a/sys/scsi/scsiconf.h +++ b/sys/scsi/scsiconf.h @@ -14,7 +14,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $Id: scsiconf.h,v 1.27 1995/07/17 23:38:01 gibbs Exp $ + * $Id: scsiconf.h,v 1.28 1995/08/23 23:03:34 gibbs Exp $ */ #ifndef SCSI_SCSICONF_H #define SCSI_SCSICONF_H 1 @@ -170,7 +170,7 @@ struct scsi_device * name. */ #define SCSI_DEVICE_ENTRIES(NAME) \ -errval NAME##attach(struct scsi_link *sc_link); \ +static errval NAME##attach(struct scsi_link *sc_link); \ extern struct scsi_device NAME##_switch; \ void NAME##init(void) { \ scsi_device_register(&NAME##_switch); \ @@ -184,7 +184,7 @@ int NAME##ioctl(dev_t dev, int cmd, caddr_t addr, int flag, struct proc *p) { \ int NAME##close(dev_t dev, int flag, int fmt, struct proc *p) { \ return scsi_close(dev, flag, fmt, p, &NAME##_switch); \ } \ -void NAME##minphys(struct buf *bp) { \ +static void NAME##minphys(struct buf *bp) { \ scsi_minphys(bp, &NAME##_switch); \ } \ void NAME##strategy(struct buf *bp) { \ diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c index 14438c9..b622556 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.66 1995/08/07 11:56:31 davidg Exp $ + * $Id: sd.c,v 1.67 1995/10/12 02:01:56 julian Exp $ */ #define SPLSD splbio @@ -57,11 +57,11 @@ u_int32 sdstrats, sdqueues; #define SDSETUNIT(DEV, U) \ makedev(major(DEV), dkmakeminor((U), dkslice(DEV), dkpart(DEV))) -errval sd_get_parms __P((int unit, int flags)); +static errval sd_get_parms __P((int unit, int flags)); static void sdstrategy1 __P((struct buf *)); -int sd_sense_handler __P((struct scsi_xfer *)); -void sdstart __P((u_int32, u_int32)); +static int sd_sense_handler __P((struct scsi_xfer *)); +static void sdstart __P((u_int32, u_int32)); struct scsi_data { u_int32 flags; @@ -81,17 +81,17 @@ struct scsi_data { static int sdunit(dev_t dev) { return SDUNIT(dev); } static dev_t sdsetunit(dev_t dev, int unit) { return SDSETUNIT(dev, unit); } -errval sd_open __P((dev_t dev, int mode, int fmt, struct proc *p, +static errval sd_open __P((dev_t dev, int mode, int fmt, struct proc *p, struct scsi_link *sc_link)); -errval sd_ioctl(dev_t dev, int cmd, caddr_t addr, int flag, +static errval sd_ioctl(dev_t dev, int cmd, caddr_t addr, int flag, struct proc *p, struct scsi_link *sc_link); -errval sd_close __P((dev_t dev, int fflag, int fmt, struct proc *p, +static errval sd_close __P((dev_t dev, int fflag, int fmt, struct proc *p, struct scsi_link *sc_link)); -void sd_strategy(struct buf *bp, struct scsi_link *sc_link); +static void sd_strategy(struct buf *bp, struct scsi_link *sc_link); SCSI_DEVICE_ENTRIES(sd) -struct scsi_device sd_switch = +static struct scsi_device sd_switch = { sd_sense_handler, sdstart, /* have a queue, served by this */ @@ -593,7 +593,7 @@ sd_ioctl(dev_t dev, int cmd, caddr_t addr, int flag, struct proc *p, /* * Find out from the device what it's capacity is */ -u_int32 +static u_int32 sd_size(unit, flags) int unit, flags; { @@ -636,7 +636,7 @@ sd_size(unit, flags) /* * Tell the device to map out a defective block */ -errval +static errval sd_reassign_blocks(unit, block) int unit, block; { @@ -672,7 +672,7 @@ sd_reassign_blocks(unit, block) * device and use the results to fill out the disk * parameter structure. */ -errval +static errval sd_get_parms(unit, flags) int unit, flags; { diff --git a/sys/scsi/st.c b/sys/scsi/st.c index 493f3a1..cdb2e8d 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.39 1995/10/12 02:02:03 julian Exp $ + * $Id: st.c,v 1.40 1995/10/12 02:05:47 julian Exp $ */ /* @@ -153,29 +153,29 @@ static struct rogues gallery[] = /* ends with an all-null entry */ }; #endif /* NEW_SCSICONF */ -errval st_space __P((u_int32 unit, int32 number, u_int32 what, u_int32 flags)); -errval st_rewind __P((u_int32 unit, boolean immed, u_int32 flags)); -errval st_erase __P((u_int32 unit, boolean immed, u_int32 flags)); +static errval st_space __P((u_int32 unit, int32 number, u_int32 what, u_int32 flags)); +static errval st_rewind __P((u_int32 unit, boolean immed, u_int32 flags)); +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)); -errval st_decide_mode __P((u_int32 unit, boolean first_read)); -errval st_rd_blk_lim __P((u_int32 unit, u_int32 flags)); -errval st_touch_tape __P((u_int32 unit)); -errval st_write_filemarks __P((u_int32 unit, int32 number, u_int32 flags)); -errval st_load __P((u_int32 unit, u_int32 type, u_int32 flags)); -errval st_mode_select __P((u_int32 unit, u_int32 flags, \ +static errval st_decide_mode __P((u_int32 unit, boolean first_read)); +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)); +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)); -errval st_comp __P((u_int32 unit, u_int32 mode)); +static errval st_comp __P((u_int32 unit, u_int32 mode)); void ststrategy(); -int32 st_chkeod(); -void ststart(u_int32 unit, u_int32 flags); -void st_unmount(); -errval st_mount_tape(); -void st_loadquirks(); +static int32 st_chkeod(); +static void ststart(u_int32 unit, u_int32 flags); +static void st_unmount(); +static errval st_mount_tape(); +static void st_loadquirks(); #ifndef NEW_SCSICONF -void st_identify_drive(); +static void st_identify_drive(); #endif -errval st_interpret_sense(); +static errval st_interpret_sense(); #define ESUCCESS 0 #define NOEJECT 0 @@ -227,17 +227,17 @@ struct scsi_data { static int stunit(dev_t dev) { return STUNIT(dev); } static dev_t stsetunit(dev_t dev, int unit) { return STSETUNIT(dev, unit); } -errval st_open(dev_t dev, int flags, int fmt, struct proc *p, -struct scsi_link *sc_link); -errval st_ioctl(dev_t dev, int cmd, caddr_t addr, int flag, +static errval st_open(dev_t dev, int flags, int fmt, struct proc *p, + struct scsi_link *sc_link); +static errval st_ioctl(dev_t dev, int cmd, caddr_t addr, int flag, struct proc *p, struct scsi_link *sc_link); -errval st_close(dev_t dev, int flag, int fmt, struct proc *p, +static errval st_close(dev_t dev, int flag, int fmt, struct proc *p, struct scsi_link *sc_link); -void st_strategy(struct buf *bp, struct scsi_link *sc_link); +static void st_strategy(struct buf *bp, struct scsi_link *sc_link); SCSI_DEVICE_ENTRIES(st) -struct scsi_device st_switch = +static struct scsi_device st_switch = { st_interpret_sense, /* check errors with us first */ ststart, /* we have a queue, and this is how we service it */ @@ -1320,7 +1320,7 @@ try_new_value: /* * Do a synchronous read. */ -errval +static errval st_read(unit, buf, size, flags) u_int32 unit, size, flags; char *buf; @@ -1567,7 +1567,7 @@ st_mode_select(unit, flags, page, pagelen) flags | SCSI_DATA_OUT)); } -int noisy_st = 0; +static int noisy_st = 0; /***************************************************************\ * Set the compression mode of the drive to on (1) or off (0) * still doesn't work! grrr! diff --git a/sys/scsi/worm.c b/sys/scsi/worm.c index 8c5a2eb..a717c82 100644 --- a/sys/scsi/worm.c +++ b/sys/scsi/worm.c @@ -37,7 +37,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: worm.c,v 1.7 1995/05/30 08:13:58 rgrimes Exp $ + * $Id: worm.c,v 1.8 1995/10/09 15:15:01 joerg Exp $ */ /* XXX This is PRELIMINARY. @@ -66,19 +66,19 @@ struct scsi_data { u_int32 blk_size; /* Size of each blocks */ }; -void wormstart(u_int32 unit, u_int32 flags); +static void wormstart(u_int32 unit, u_int32 flags); -errval worm_open(dev_t dev, int flags, int fmt, struct proc *p, -struct scsi_link *sc_link); -errval worm_ioctl(dev_t dev, int cmd, caddr_t addr, int flag, +static errval worm_open(dev_t dev, int flags, int fmt, struct proc *p, + struct scsi_link *sc_link); +static errval worm_ioctl(dev_t dev, int cmd, caddr_t addr, int flag, struct proc *p, struct scsi_link *sc_link); -errval worm_close(dev_t dev, int flag, int fmt, struct proc *p, +static errval worm_close(dev_t dev, int flag, int fmt, struct proc *p, struct scsi_link *sc_link); -void worm_strategy(struct buf *bp, struct scsi_link *sc_link); +static void worm_strategy(struct buf *bp, struct scsi_link *sc_link); SCSI_DEVICE_ENTRIES(worm) -struct scsi_device worm_switch = +static struct scsi_device worm_switch = { NULL, wormstart, /* we have a queue, and this is how we service it */ @@ -126,7 +126,7 @@ static int worm_size(struct scsi_link *sc_link, int flags) return ret; } -errval +static errval wormattach(struct scsi_link *sc_link) { struct scsi_data *worm = sc_link->sd; @@ -158,7 +158,7 @@ wormattach(struct scsi_link *sc_link) * into. In particular, the removable media checking should be * handled in one place. */ -void +static void wormstart(unit, flags) u_int32 unit; u_int32 flags; @@ -252,7 +252,7 @@ badnews: } /* go back and see if we can cram more work in.. */ } -void +static void worm_strategy(struct buf *bp, struct scsi_link *sc_link) { struct buf **dp; @@ -305,7 +305,7 @@ worm_strategy(struct buf *bp, struct scsi_link *sc_link) /* * Open the device. XXX: I'm completely guessing at this sequence. */ -int +static int worm_open(dev_t dev, int flags, int fmt, struct proc *p, struct scsi_link *sc_link) { @@ -351,7 +351,7 @@ struct scsi_link *sc_link) return 0; } -int +static int worm_close(dev_t dev, int flag, int fmt, struct proc *p, struct scsi_link *sc_link) { |