diff options
| -rw-r--r-- | util/nvramtool/cmos_lowlevel.c | 46 | ||||
| -rw-r--r-- | util/nvramtool/common.h | 19 |
2 files changed, 58 insertions, 7 deletions
diff --git a/util/nvramtool/cmos_lowlevel.c b/util/nvramtool/cmos_lowlevel.c index 9ad6891d0c..b5e8dee9b2 100644 --- a/util/nvramtool/cmos_lowlevel.c +++ b/util/nvramtool/cmos_lowlevel.c @@ -28,7 +28,11 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. \*****************************************************************************/ -#include <sys/io.h> +#if defined(__FreeBSD__) +#include <fcntl.h> +#include <unistd.h> +#endif + #include "common.h" #include "cmos_lowlevel.h" @@ -176,8 +180,8 @@ unsigned char cmos_read_byte (unsigned index) port_1 = 0x73; } - outb(index, port_0); - return inb(port_1); + OUTB(index, port_0); + return INB(port_1); } /**************************************************************************** @@ -204,8 +208,8 @@ void cmos_write_byte (unsigned index, unsigned char value) port_1 = 0x73; } - outb(index, port_0); - outb(value, port_1); + OUTB(index, port_0); + OUTB(value, port_1); } /**************************************************************************** @@ -248,8 +252,35 @@ void cmos_write_all (unsigned char data[]) * level is therefore somewhat dangerous. ****************************************************************************/ void set_iopl (int level) - { assert((level >= 0) && (level <= 3)); - + { +#if defined(__FreeBSD__) + static int io_fd = -1; +#endif + + assert((level >= 0) && (level <= 3)); + +#if defined(__FreeBSD__) + if (level == 0) + { + if (io_fd != -1) + { + close(io_fd); + io_fd = -1; + } + } + else + { + if (io_fd == -1) + { + io_fd = open("/dev/io", O_RDWR); + if (io_fd < 0) + { + perror("/dev/io"); + exit(1); + } + } + } +#else if (iopl(level)) { fprintf(stderr, "%s: iopl() system call failed. You must be root to do " @@ -257,6 +288,7 @@ void set_iopl (int level) prog_name); exit(1); } +#endif } /**************************************************************************** diff --git a/util/nvramtool/common.h b/util/nvramtool/common.h index f262ea41ab..a247380bce 100644 --- a/util/nvramtool/common.h +++ b/util/nvramtool/common.h @@ -43,6 +43,25 @@ #include <string.h> #include <ctype.h> +#if defined(__FreeBSD__) +#include <sys/types.h> +#include <machine/cpufunc.h> +#define OUTB(x, y) do { u_int tmp = (y); outb(tmp, (x)); } while (0) +#define OUTW(x, y) do { u_int tmp = (y); outw(tmp, (x)); } while (0) +#define OUTL(x, y) do { u_int tmp = (y); outl(tmp, (x)); } while (0) +#define INB(x) __extension__ ({ u_int tmp = (x); inb(tmp); }) +#define INW(x) __extension__ ({ u_int tmp = (x); inw(tmp); }) +#define INL(x) __extension__ ({ u_int tmp = (x); inl(tmp); }) +#else +#include <sys/io.h> +#define OUTB outb +#define OUTW outw +#define OUTL outl +#define INB inb +#define INW inw +#define INL inl +#endif + #define FALSE 0 #define TRUE 1 |