Index: hwaccess.h =================================================================== --- hwaccess.h (revision 837) +++ hwaccess.h (working copy) @@ -76,6 +76,63 @@ #endif #endif +#if defined(__NetBSD__) + #define off64_t off_t + #define lseek64 lseek + #if defined(__i386__) || defined(__x86_64__) + #include + #include + #if defined(__i386__) + #define iopl i386_iopl + #elif defined(__x86_64__) + #define iopl x86_64_iopl + #endif + #include + +static inline void +outb(uint8_t value, uint16_t port) +{ + asm volatile ("outb %b0,%w1": :"a" (value), "Nd" (port)); +} + +static inline uint8_t +inb(uint16_t port) +{ + uint8_t value; + asm volatile ("inb %w1,%0":"=a" (value):"Nd" (port)); + return value; +} + +static inline void +outw(uint16_t value, uint16_t port) +{ + asm volatile ("outw %w0,%w1": :"a" (value), "Nd" (port)); +} + +static inline uint16_t +inw(uint16_t port) +{ + uint16_t value; + asm volatile ("inw %w1,%0":"=a" (value):"Nd" (port)); + return value; +} + +static inline void +outl(uint32_t value, uint16_t port) +{ + asm volatile ("outl %0,%w1": :"a" (value), "Nd" (port)); +} + +static inline uint32_t +inl(uint16_t port) +{ + uint32_t value; + asm volatile ("inl %1,%0":"=a" (value):"Nd" (port)); + return value; +} + #endif +#endif + #if defined(__FreeBSD__) || defined(__DragonFly__) extern int io_fd; #endif Index: Makefile =================================================================== --- Makefile (revision 837) +++ Makefile (working copy) @@ -178,7 +178,11 @@ # into internal-programmer-only stuff # and a support lib for all internal+pci # based stuff. +ifeq ($(OS_ARCH), NetBSD) +LIBS += -lpciutils # The libpci we want. +LIBS += -l$(shell uname -m) # For (i386|x86_64)_iopl(2). endif +endif ifeq ($(CONFIG_PRINT_WIKI), yes) FEATURE_CFLAGS += -D'PRINT_WIKI_SUPPORT=1' Index: README =================================================================== --- README (revision 837) +++ README (working copy) @@ -65,10 +65,10 @@ gmake LDFLAGS="-L$pathtolibpci" CC="gcc -I$pathtopciheaders" CFLAGS=-O2 -To compile on DragonFly BSD, use: +To compile on NetBSD or DragonFly BSD, use: ln -s /usr/pkg/include/pciutils pci - gmake CFLAGS=-I. LDFLAGS="-L/usr/pkg/lib" + gmake CFLAGS=-I. LDFLAGS="-L/usr/pkg/lib -Wl,-rpath-link,/usr/pkg/lib" To compile and run on Darwin/Mac OS X: