diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-05-02 13:51:54 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-05-02 13:51:54 +0000 |
| commit | 5042288e631a70a7c5e69ca3034259a8223c4d94 (patch) | |
| tree | de2847cd9f939b7fd876699287e6e6b1377328c3 /sys/dev/ic/am7990var.h | |
| parent | 7828ffbca662a907b36e851b4f506dcfb096f025 (diff) | |
make these work together
Diffstat (limited to 'sys/dev/ic/am7990var.h')
| -rw-r--r-- | sys/dev/ic/am7990var.h | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/sys/dev/ic/am7990var.h b/sys/dev/ic/am7990var.h index 2e66bb6e804..337bc871fb5 100644 --- a/sys/dev/ic/am7990var.h +++ b/sys/dev/ic/am7990var.h @@ -1,5 +1,5 @@ -/* $OpenBSD: am7990var.h,v 1.3 1996/04/18 23:47:18 niklas Exp $ */ -/* $NetBSD: am7990var.h,v 1.4 1996/03/14 19:05:09 christos Exp $ */ +/* $OpenBSD: am7990var.h,v 1.4 1996/05/02 13:51:46 deraadt Exp $ */ +/* $NetBSD: am7990var.h,v 1.6 1996/04/22 02:40:49 christos Exp $ */ /* * Copyright (c) 1995 Charles M. Hannum. All rights reserved. @@ -33,7 +33,7 @@ #ifdef DDB #define integrate #else -#define integrate static inline +#define integrate static __inline #endif void leconfig __P((struct le_softc *)); @@ -46,6 +46,7 @@ void lestart __P((struct ifnet *)); void lestop __P((struct le_softc *)); void lewatchdog __P((int)); +integrate void lehwinit __P((struct le_softc *)); integrate u_int16_t lerdcsr __P((struct le_softc *, u_int16_t)); integrate void lewrcsr __P((struct le_softc *, u_int16_t, u_int16_t)); @@ -63,17 +64,17 @@ integrate void leread __P((struct le_softc *, int, int)); * for drivers that have not yet been optimized. */ #ifdef LE_NEED_BUF_CONTIG -integrate void copytobuf_contig __P((struct le_softc *, void *, int, int)); -integrate void copyfrombuf_contig __P((struct le_softc *, void *, int, int)); -integrate void zerobuf_contig __P((struct le_softc *, int, int)); +void am7990_copytobuf_contig __P((struct le_softc *, void *, int, int)); +void am7990_copyfrombuf_contig __P((struct le_softc *, void *, int, int)); +void am7990_zerobuf_contig __P((struct le_softc *, int, int)); #endif /* LE_NEED_BUF_CONTIG */ #ifdef LE_NEED_BUF_GAP2 -integrate void copytobuf_gap2 __P((struct le_softc *, void *, int, int)); -integrate void copyfrombuf_gap2 __P((struct le_softc *, void *, int, int)); -integrate void zerobuf_gap2 __P((struct le_softc *, int, int)); +void am7990_copytobuf_gap2 __P((struct le_softc *, void *, int, int)); +void am7990_copyfrombuf_gap2 __P((struct le_softc *, void *, int, int)); +void am7990_zerobuf_gap2 __P((struct le_softc *, int, int)); #endif /* LE_NEED_BUF_GAP2 */ #ifdef LE_NEED_BUF_GAP16 -integrate void copytobuf_gap16 __P((struct le_softc *, void *, int, int)); -integrate void copyfrombuf_gap16 __P((struct le_softc *, void *, int, int)); -integrate void zerobuf_gap16 __P((struct le_softc *, int, int)); +void am7990_copytobuf_gap16 __P((struct le_softc *, void *, int, int)); +void am7990_copyfrombuf_gap16 __P((struct le_softc *, void *, int, int)); +void am7990_zerobuf_gap16 __P((struct le_softc *, int, int)); #endif /* LE_NEED_BUF_GAP16 */ |