diff options
| author | bde <bde@FreeBSD.org> | 2000-11-04 15:03:34 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 2000-11-04 15:03:34 +0000 |
| commit | 048bdff41c996b7ebd1b376dcb8e59063c10d506 (patch) | |
| tree | 99636eab390565a6410ad8a1a0c73977185752e6 | |
| parent | a9f20e6f32d56b921dd9e2c916b6ab7d4ae3f48a (diff) | |
| download | FreeBSD-src-048bdff41c996b7ebd1b376dcb8e59063c10d506.zip FreeBSD-src-048bdff41c996b7ebd1b376dcb8e59063c10d506.tar.gz | |
Added used include of <machine/bus.h> -- don't depend on evil namespace
pollution in <sys/mutex.h>. This was half fixed in rev.1.3 of
midwayreg.h. The pollution exposed the bug that this driver was using
toy versions of the bus space macros under FreeBSD. Disabling the
toy versions made this driver compile but dependent on the pollution.
There was still a toy version of bus_space_read_1() in unreachable code.
| -rw-r--r-- | sys/dev/en/if_en_pci.c | 3 | ||||
| -rw-r--r-- | sys/pci/if_en_pci.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/dev/en/if_en_pci.c b/sys/dev/en/if_en_pci.c index 8a17e65..e515fad 100644 --- a/sys/dev/en/if_en_pci.c +++ b/sys/dev/en/if_en_pci.c @@ -56,6 +56,7 @@ #include <sys/malloc.h> #include <sys/socket.h> +#include <machine/bus.h> #include <net/if.h> @@ -321,7 +322,7 @@ en_pci_shutdown( #if !defined(MIDWAY_ENIONLY) -#if defined(sparc) || defined(__FreeBSD__) +#if defined(sparc) #define bus_space_read_1(t, h, o) \ ((void)t, (*(volatile u_int8_t *)((h) + (o)))) #endif diff --git a/sys/pci/if_en_pci.c b/sys/pci/if_en_pci.c index 8a17e65..e515fad 100644 --- a/sys/pci/if_en_pci.c +++ b/sys/pci/if_en_pci.c @@ -56,6 +56,7 @@ #include <sys/malloc.h> #include <sys/socket.h> +#include <machine/bus.h> #include <net/if.h> @@ -321,7 +322,7 @@ en_pci_shutdown( #if !defined(MIDWAY_ENIONLY) -#if defined(sparc) || defined(__FreeBSD__) +#if defined(sparc) #define bus_space_read_1(t, h, o) \ ((void)t, (*(volatile u_int8_t *)((h) + (o)))) #endif |
