diff options
| -rw-r--r-- | util/dell-flash-unlock/Makefile | 3 | ||||
| -rw-r--r-- | util/dell-flash-unlock/README.md | 4 | ||||
| -rw-r--r-- | util/dell-flash-unlock/accessors.c | 32 |
3 files changed, 34 insertions, 5 deletions
diff --git a/util/dell-flash-unlock/Makefile b/util/dell-flash-unlock/Makefile index fae52dea..aee07167 100644 --- a/util/dell-flash-unlock/Makefile +++ b/util/dell-flash-unlock/Makefile @@ -6,6 +6,9 @@ CFLAGS=-Wall -Wextra -Werror -O2 -pedantic ifeq ($(shell uname), OpenBSD) CFLAGS += -l$(shell uname -p) endif +ifeq ($(shell uname), NetBSD) + CFLAGS += -l$(shell uname -p) +endif SRCS=dell_flash_unlock.c accessors.c all: $(SRCS) accessors.h diff --git a/util/dell-flash-unlock/README.md b/util/dell-flash-unlock/README.md index 9c7d292c..aca01743 100644 --- a/util/dell-flash-unlock/README.md +++ b/util/dell-flash-unlock/README.md @@ -20,8 +20,8 @@ around 2008 (E6400 era). If it says it is not set, then you will need to install or compile a kernel with that option set. -### OpenBSD -- On OpenBSD, ensure you are booting with securelevel set to -1. +### OpenBSD/NetBSD +- On OpenBSD/NetBSD, ensure you are booting with securelevel set to -1. ### General Make sure an AC adapter is plugged into your system diff --git a/util/dell-flash-unlock/accessors.c b/util/dell-flash-unlock/accessors.c index 6fca2817..a35f8139 100644 --- a/util/dell-flash-unlock/accessors.c +++ b/util/dell-flash-unlock/accessors.c @@ -5,15 +5,15 @@ #include <sys/io.h> #endif -#if defined(__OpenBSD__) -#include <machine/sysarch.h> +#if defined(__OpenBSD__) || defined(__NetBSD__) #include <sys/types.h> +#include <machine/sysarch.h> #if defined(__amd64__) #include <amd64/pio.h> #elif defined(__i386__) #include <i386/pio.h> #endif /* __i386__ */ -#endif /* __OpenBSD__ */ +#endif /* __OpenBSD__ || __NetBSD__ */ #include <errno.h> @@ -42,6 +42,9 @@ sys_outb(unsigned int port, uint8_t data) #if defined(__OpenBSD__) outb(port, data); #endif + #if defined(__NetBSD__) + __asm__ volatile ( "outb %b0, %w1" : : "a"(data), "d"(port) : "memory"); + #endif } void @@ -53,6 +56,9 @@ sys_outl(unsigned int port, uint32_t data) #if defined(__OpenBSD__) outl(port, data); #endif + #if defined(__NetBSD__) + __asm__ volatile ( "outl %0, %w1" : : "a"(data), "d"(port) : "memory"); + #endif } uint8_t @@ -61,6 +67,12 @@ sys_inb(unsigned int port) #if defined(__linux__) || defined (__OpenBSD__) return inb(port); #endif + + #if defined(__NetBSD__) + uint8_t retval; + __asm__ volatile("inb %w1, %b0" : "=a" (retval) : "d" (port) : "memory"); + return retval; + #endif return 0; } @@ -70,6 +82,11 @@ sys_inl(unsigned int port) #if defined(__linux__) || defined (__OpenBSD__) return inl(port); #endif + #if defined(__NetBSD__) + int retval; + __asm__ volatile("inl %w1, %0" : "=a" (retval) : "d" (port) : "memory"); + return retval; + #endif return 0; } @@ -86,6 +103,15 @@ sys_iopl(int level) return amd64_iopl(level); #endif /* __amd64__ */ #endif /* __OpenBSD__ */ + +#if defined(__NetBSD__) +#if defined(__i386__) + return i386_iopl(level); +#elif defined(__amd64__) + return x86_64_iopl(level); +#endif /* __amd64__ */ +#endif /* __NetBSD__ */ + errno = ENOSYS; return -1; } |