diff options
| author | phk <phk@FreeBSD.org> | 1999-10-06 07:26:48 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 1999-10-06 07:26:48 +0000 |
| commit | 285482d393b1fe2e0145d8fd55210218dd8f9b25 (patch) | |
| tree | 970e234d588aca90723cd6421de56012794fd296 /sys/i386/isa/bs | |
| parent | 279ad3002560565c3597b5ce3b202b05e84d2336 (diff) | |
| download | FreeBSD-src-285482d393b1fe2e0145d8fd55210218dd8f9b25.zip FreeBSD-src-285482d393b1fe2e0145d8fd55210218dd8f9b25.tar.gz | |
Add $FreeBSD$.
Remove some minphys related cruft.
Diffstat (limited to 'sys/i386/isa/bs')
| -rw-r--r-- | sys/i386/isa/bs/bsif.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sys/i386/isa/bs/bsif.c b/sys/i386/isa/bs/bsif.c index 948d3b6..ea2deb6 100644 --- a/sys/i386/isa/bs/bsif.c +++ b/sys/i386/isa/bs/bsif.c @@ -25,6 +25,8 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * $FreeBSD$ */ #if 0 @@ -81,8 +83,6 @@ static int bsprobe __P((struct isa_device *)); static void bs_poll(struct cam_sim *sim); static int bsattach(struct isa_device *); static ointhand2_t bsintr; -static int bsprint __P((void *, const char *)); -static void bs_scsi_minphys __P((struct buf *)); static int bs_dmarangecheck __P((caddr_t, unsigned)); struct isa_driver bsdriver = { @@ -207,11 +207,8 @@ bad: } #endif /* __FreeBSD__ */ -#ifdef __FreeBSD__ -static int -#else /* __NetBSD__ */ +#ifdef __NetBSD__ int -#endif /* __NetBSD__ */ bsprint(aux, name) void *aux; const char *name; @@ -221,6 +218,7 @@ bsprint(aux, name) printf("%s: scsibus ", name); return UNCONF; } +#endif #ifdef __FreeBSD__ static void @@ -235,7 +233,6 @@ bsattach(dev) { int unit = dev->id_unit; struct bs_softc *bsc = bscdata[unit]; - struct scsibus_data *scbus; struct cam_devq *devq; dev->id_ointr = bsintr; @@ -294,6 +291,7 @@ bsintr(unit) /***************************************************************** * JULIAN SCSI <=> BS INTERFACE *****************************************************************/ +#ifndef __FreeBSD__ static void bs_scsi_minphys(bp) struct buf *bp; @@ -303,6 +301,7 @@ bs_scsi_minphys(bp) bp->b_bcount = BSDMABUFSIZ; minphys(bp); } +#endif #if 0 XSBS_INT32T bs_target_open(sc, cf) |
