diff options
| author | nyan <nyan@FreeBSD.org> | 2000-10-15 04:54:17 +0000 |
|---|---|---|
| committer | nyan <nyan@FreeBSD.org> | 2000-10-15 04:54:17 +0000 |
| commit | 6df9be0e35b54b58c1514f3c2d88aaf3a62b256e (patch) | |
| tree | ce86369bb07675fa0dcba83eeaec714ce02d6727 /sys/i386/isa/bs | |
| parent | 3a05390ac27985a3d69dc03063e56f783e9422d5 (diff) | |
| download | FreeBSD-src-6df9be0e35b54b58c1514f3c2d88aaf3a62b256e.zip FreeBSD-src-6df9be0e35b54b58c1514f3c2d88aaf3a62b256e.tar.gz | |
Fixed warnings.
Diffstat (limited to 'sys/i386/isa/bs')
| -rw-r--r-- | sys/i386/isa/bs/bsfunc.c | 2 | ||||
| -rw-r--r-- | sys/i386/isa/bs/bshw_dma.c | 7 | ||||
| -rw-r--r-- | sys/i386/isa/bs/bshw_pdma.c | 5 | ||||
| -rw-r--r-- | sys/i386/isa/bs/bsif.h | 2 |
4 files changed, 10 insertions, 6 deletions
diff --git a/sys/i386/isa/bs/bsfunc.c b/sys/i386/isa/bs/bsfunc.c index d4fc51c..42a636f 100644 --- a/sys/i386/isa/bs/bsfunc.c +++ b/sys/i386/isa/bs/bsfunc.c @@ -631,7 +631,7 @@ bs_check_target(ti) /* inquiry */ bzero(&scsi_cmd, sizeof(scsi_cmd)); scsi_cmd.opcode = INQUIRY; - scsi_cmd.length = sizeof(struct scsi_inquiry_data); + scsi_cmd.length = (u_int8_t) sizeof(struct scsi_inquiry_data); cb = bs_make_internal_ccb(ti, 0, (u_int8_t *) &scsi_cmd, sizeof(scsi_cmd), (u_int8_t *) &scsi_inquiry_data, diff --git a/sys/i386/isa/bs/bshw_dma.c b/sys/i386/isa/bs/bshw_dma.c index 5b32de7..74cc3ee 100644 --- a/sys/i386/isa/bs/bshw_dma.c +++ b/sys/i386/isa/bs/bshw_dma.c @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /* $NecBSD: bshw_dma.c,v 1.3 1997/07/26 06:03:16 honda Exp $ */ /* $NetBSD$ */ /* @@ -35,7 +36,7 @@ /********************************************************* * static declare. *********************************************************/ -static BS_INLINE void bshw_dmastart __P((struct bs_softc *)); +static void bshw_dmastart __P((struct bs_softc *)); static void bshw_dmadone __P((struct bs_softc *)); /********************************************** @@ -172,7 +173,7 @@ bs_dma_xfer_end(ti) /********************************************** * GENERIC DMA FUNCS **********************************************/ -static short dmapageport[4] = { 0x27, 0x21, 0x23, 0x25 }; +static u_int8_t dmapageport[4] = { 0x27, 0x21, 0x23, 0x25 }; /* common dma settings */ #undef DMA1_SMSK @@ -186,7 +187,7 @@ static short dmapageport[4] = { 0x27, 0x21, 0x23, 0x25 }; #undef DMA1_CHN #define DMA1_CHN(c) (0x01 + ((c) << 2)) -static BS_INLINE void +static void bshw_dmastart(bsc) struct bs_softc *bsc; { diff --git a/sys/i386/isa/bs/bshw_pdma.c b/sys/i386/isa/bs/bshw_pdma.c index 3443afb..a4e4cb7 100644 --- a/sys/i386/isa/bs/bshw_pdma.c +++ b/sys/i386/isa/bs/bshw_pdma.c @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /* $NecBSD: bshw_pdma.c,v 1.4 1997/10/31 17:43:39 honda Exp $ */ /* $NetBSD$ */ /* @@ -36,7 +37,7 @@ static BS_INLINE void bshw_lc_smit_start __P((struct bs_softc *, int, u_int)); static int bshw_lc_smit_fstat __P((struct bs_softc *, int, int)); -static BS_INLINE void bshw_lc_smit_stop __P((struct bs_softc *)); +static void bshw_lc_smit_stop __P((struct bs_softc *)); /********************************************************* * SM FIFO (GENERIC) @@ -115,7 +116,7 @@ bad: #define LC_SFSZ 0x0c #define LC_REST (LC_FSZ - LC_SFSZ) -static BS_INLINE void +static void bshw_lc_smit_stop(bsc) struct bs_softc *bsc; { diff --git a/sys/i386/isa/bs/bsif.h b/sys/i386/isa/bs/bsif.h index 6ac4cba..ed63175 100644 --- a/sys/i386/isa/bs/bsif.h +++ b/sys/i386/isa/bs/bsif.h @@ -105,7 +105,9 @@ #endif /* __NetBSD__ */ #ifdef __FreeBSD__ +#include <sys/bus.h> #include <sys/conf.h> +#include <sys/interrupt.h> #include <sys/proc.h> #include <vm/vm_extern.h> #include <vm/vm_kern.h> |
