r3709 - trunk/util/nvramtool

Author: uwe
Date: 2008-10-30 16:41:39 +0100 (Thu, 30 Oct 2008)
New Revision: 3709

Modified:
   trunk/util/nvramtool/cmos_lowlevel.c
   trunk/util/nvramtool/common.h
Log:
Allow nvramtool to build and work on FreeBSD. Tested on FreeBSD 7.

Signed-off-by: Andriy Gapon 
Acked-by: Uwe Hermann

Modified: trunk/util/nvramtool/cmos_lowlevel.c
===================================================================
--- trunk/util/nvramtool/cmos_lowlevel.c	2008-10-30 03:10:17 UTC (rev 3708)
+++ trunk/util/nvramtool/cmos_lowlevel.c	2008-10-30 15:41:39 UTC (rev 3709)
@@ -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 @@
       port_1 = 0x73;
     }

-   outb(index, port_0);
-   return inb(port_1);
+   OUTB(index, port_0);
+   return INB(port_1);
  }

/****************************************************************************
@@ -204,8 +208,8 @@
       port_1 = 0x73;
     }

-   outb(index, port_0);
-   outb(value, port_1);
+   OUTB(index, port_0);
+   OUTB(value, port_1);
  }

/****************************************************************************
@@ -248,8 +252,35 @@
  * 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 @@
               prog_name);
       exit(1);
     }
+#endif
  }

/****************************************************************************

Modified: trunk/util/nvramtool/common.h
===================================================================
--- trunk/util/nvramtool/common.h	2008-10-30 03:10:17 UTC (rev 3708)
+++ trunk/util/nvramtool/common.h	2008-10-30 15:41:39 UTC (rev 3709)
@@ -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