diff options
| author |   deraadt <deraadt@openbsd.org> | 1996-10-16 12:38:05 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 1996-10-16 12:38:05 +0000 |
| commit | b820ed2faa8be95e6bb3c82ac46c608c9dba0d67 (patch) | |
| tree | b1fedd875a91331f49a2cc44f8c23e15dec3d94c | |
| parent | type death (diff) | |
| download | wireguard-openbsd-b820ed2faa8be95e6bb3c82ac46c608c9dba0d67.tar.xz wireguard-openbsd-b820ed2faa8be95e6bb3c82ac46c608c9dba0d67.zip | |
-Wall happiness
| -rw-r--r-- | sys/dev/eisa/aha1742.c | 22 | ||||
| -rw-r--r-- | sys/dev/eisa/ahc_eisa.c | 4 |
2 files changed, 19 insertions, 7 deletions
diff --git a/sys/dev/eisa/aha1742.c b/sys/dev/eisa/aha1742.c index 93f90af8452..bc0f6062431 100644 --- a/sys/dev/eisa/aha1742.c +++ b/sys/dev/eisa/aha1742.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aha1742.c,v 1.10 1996/06/02 10:42:58 tholo Exp $ */ +/* $OpenBSD: aha1742.c,v 1.11 1996/10/16 12:38:05 deraadt Exp $ */ /* $NetBSD: aha1742.c,v 1.61 1996/05/12 23:40:01 mycroft Exp $ */ /* @@ -294,9 +294,9 @@ int ahb_scsi_cmd __P((struct scsi_xfer *)); void ahb_timeout __P((void *)); void ahb_print_ecb __P((struct ahb_ecb *)); void ahb_print_active_ecb __P((struct ahb_softc *)); +int ahbprint __P((void *, char *)); #define MAX_SLOTS 15 -static ahb_slot = 0; /* slot last board was found in */ int ahb_debug = 0; #define AHB_SHOWECBS 0x01 #define AHB_SHOWINTS 0x02 @@ -454,9 +454,12 @@ ahbmatch(parent, match, aux) return (rv); } -ahbprint() +int +ahbprint(aux, name) + void *aux; + char *name; { - + return UNCONF; } /* @@ -709,6 +712,8 @@ ahb_free_ecb(sc, ecb, flags) splx(s); } +static inline void ahb_init_ecb __P((struct ahb_softc *, struct ahb_ecb *)); + static inline void ahb_init_ecb(sc, ecb) struct ahb_softc *sc; @@ -727,6 +732,8 @@ ahb_init_ecb(sc, ecb) sc->ecbhash[hashnum] = ecb; } +static inline void ahb_reset_ecb __P((struct ahb_softc *, struct ahb_ecb *)); + static inline void ahb_reset_ecb(sc, ecb) struct ahb_softc *sc; @@ -762,8 +769,9 @@ ahb_get_ecb(sc, flags) break; } if (sc->numecbs < AHB_ECB_MAX) { - if (ecb = (struct ahb_ecb *) malloc(sizeof(struct ahb_ecb), - M_TEMP, M_NOWAIT)) { + ecb = (struct ahb_ecb *) malloc(sizeof(struct ahb_ecb), + M_TEMP, M_NOWAIT); + if (ecb) { ahb_init_ecb(sc, ecb); sc->numecbs++; } else { @@ -932,7 +940,9 @@ ahb_scsi_cmd(xs) int seg; /* scatter gather seg being worked on */ u_long thiskv, thisphys, nextphys; int bytes_this_seg, bytes_this_page, datalen, flags; +#ifdef TFS struct iovec *iovp; +#endif int s; SC_DEBUG(sc_link, SDEV_DB2, ("ahb_scsi_cmd\n")); diff --git a/sys/dev/eisa/ahc_eisa.c b/sys/dev/eisa/ahc_eisa.c index 03b7564ff04..0f15cd9b2f0 100644 --- a/sys/dev/eisa/ahc_eisa.c +++ b/sys/dev/eisa/ahc_eisa.c @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ahc_eisa.c,v 1.4 1996/10/04 02:51:24 deraadt Exp $ + * $Id: ahc_eisa.c,v 1.5 1996/10/16 12:38:07 deraadt Exp $ */ #if defined(__FreeBSD__) @@ -197,6 +197,8 @@ struct cfattach ahc_eisa_ca = { sizeof(struct ahc_data), ahc_eisa_match, ahc_eisa_attach }; +int ahc_eisa_irq __P((bus_chipset_tag_t, bus_io_handle_t)); + /* * Return irq setting of the board, otherwise -1. */ |