Partial port of the server to OpenBSD and NetBSD/i386.

2001-12-25 19:28:54 +00:00
parent 1778464b0f
commit 09b4ff9271
4 changed files with 212 additions and 45 deletions
@@ -21,6 +21,7 @@
 * $Id$
 */

+#include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>			  /* for semaphore functions */
@@ -30,8 +31,9 @@

 #include "lcd_sem.h"

-#ifdef _SEM_SEMUN_UNDEFINED
-/* according to X/OPEN we have to define it ourselves */
+// according to X/OPEN we have to define it ourselves
+//#ifdef _SEM_SEMUN_UNDEFINED
+#ifndef HAVE_UNION_SEMUN
 union semun {
 	int val;                    /* value for SETVAL */
 	struct semid_ds *buf;       /* buffer for IPC_STAT, IPC_SET */
@@ -148,6 +150,7 @@ sem_signal (int sid)
 int
 sem_remove (int sid)
 {
+#ifdef EIDRM
 	int i;
 	union semun dummy;

@@ -163,5 +166,6 @@ sem_remove (int sid)
 		}
 	}

+#endif
 	return 0;
 }
@@ -1,68 +1,171 @@
 #ifndef PORT_H
 #define PORT_H
-/*-----------------------------------------------------------------------------
- * port.h (by damianf@wpi.edu)
+
+/* $id$ 
 * Low level I/O functions taken from led-stat.txt
- * 
- * Jan 22 95
+ * Jan 22 95 copyright damianf@wpi.edu
 *
 * DOS part (tested only with DOS version of GCC, DJGPP)
 * by M.Prinke <m.prinke@trashcan.mcnet.de> 3/97
+ *
+ * FreeBSD support by Guillaume Filion and Philip Pokorny, copyright 05/2001
+ *
+ * NetBSD port by Guillaume Filion, copyright 12/2001
 */

-/* #define DOS */
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif

-#ifndef DOS
-static inline int
-port_in (int port)
-{
+#include <stdio.h>
+
+/*
+This file defines 4 static inline functions for port I/O:
+
+// Read a byte from port
+static inline int port_in (unsigned short int port);
+// Returns the content of the byte.
+
+// Write a char(byte) 'val' to port.
+static inline void port_out (unsigned short int port, unsigned char val);
+// Returns nothing.
+
+// Get access to a specific port
+static inline int port_access (unsigned short int port);
+// Returns 0 if successful, -1 if failed
+
+// Get access 3 to ports: port (CONTROL), port+1 (STATUS) and port+2 (DATA)
+static inline int port_access_full (unsigned short int port);
+// Returns 0 if successful, -1 if failed
+*/
+
+// -------------------------------------------------------------
+// Use ioperm, inb and outb in <sys/io.h> (Linux)
+#if defined HAVE_IOPERM && HAVE_SYS_IO_H
+#include <sys/io.h>
+
+// Read a byte from port
+static inline int port_in (unsigned short int port) {
+	return inb(port);
+}
+
+// Write a byte 'val' to port
+static inline void port_out (unsigned short int port, unsigned char val) {
+	outb(val, port);
+}
+
+// Get access to a specific port
+static inline int port_access (unsigned short int port) {
+	return ioperm(port, 1, 255);
+}
+
+// Get access to 3 ports: port (CONTROL), port+1 (STATUS) and port+2 (DATA)
+static inline int port_access_full (unsigned short int port) {
+	return ioperm(port, 3, 255);
+}
+
+// -------------------------------------------------------------
+// Use i386_get_ioperm, i386_set_ioperm, inb and outb from <machine/pio.h> (NetBSD)
+#elif defined HAVE_LIBI386 && defined HAVE_MACHINE_PIO_H && defined HAVE_MACHINE_SYSARCH_H
+#include <sys/types.h>
+#include <machine/pio.h>
+#include <machine/sysarch.h>
+
+// Read a byte from port
+static inline int port_in (unsigned short int port) {
+	return inb(port);
+}
+
+// Write a byte 'val' to port
+static inline void port_out (unsigned short int port, unsigned char val) {
+	outb(port, val);
+}
+
+static inline void setaccess(u_long * map, u_int bit, int allow) {
+	u_int           word;
+	u_int           shift;
+	u_long          mask;
+
+	word = bit / 32;
+	shift = bit - (word * 32);
+
+	mask = 0x000000001 << shift;
+	if (allow)
+		map[word] &= ~mask;
+	else
+		map[word] |= mask;
+}
+
+// Get access to a specific port
+static inline int port_access (unsigned short int port) {
+	u_long          iomap[32];
+	
+	if (i386_get_ioperm(iomap) == -1) return -1;
+
+	setaccess(iomap, port  , 1);
+
+	if (i386_set_ioperm(iomap) == -1) return -1;
+	
+	return 0;
+}
+
+// Get access to 3 ports: port (CONTROL), port+1 (STATUS) and port+2 (DATA)
+static inline int port_access_full (unsigned short int port) {
+	u_long          iomap[32];
+	
+	if (i386_get_ioperm(iomap) == -1) return -1;
+		
+	setaccess(iomap, port  , 1);
+	setaccess(iomap, port+1, 1);
+	setaccess(iomap, port+2, 1);
+
+	if (i386_set_ioperm(iomap) == -1) return -1;
+
+	return 0;
+}
+
+//#endif // defined HAVE_LIBI386 && defined HAVE_SYS_TYPES_H && defined HAVE_MACHINE_PIO_H
+
+// -------------------------------------------------------------
+// Last chance! Use /dev/io and i386 ASM code (BSD4.3 ?)
+#else
+
+// Read a byte from port
+static inline int port_in (unsigned short int port) {
 	unsigned char value;
 	__asm__ volatile ("inb %1,%0":"=a" (value)
 							:"d" ((unsigned short) port));
 	return value;
 }

-static inline void
-port_out (unsigned short int port, unsigned char val)
-{
+// Write a byte 'val' to port
+static inline void port_out (unsigned short int port, unsigned char val) {
 	__asm__ volatile ("outb %0,%1\n"::"a" (val), "d" (port)
 		 );
 }

-/***
- *** Get access to a specific port
- ***/
-#ifdef HAVE_IOPERM
-/* Assume this is a LINUX system with ioperm */
-#include <sys/io.h>
+// Get access to 3 ports: port (CONTROL), port+1 (STATUS) and port+2 (DATA)
+static inline int port_access_full (unsigned short int port) {
+	static FILE *  port_access_handle = NULL ;

-static inline int
-port_access (unsigned short int port)
-{
-	return ioperm( port, 1, 255);
-}
-
-#else
-/* Assume this is a BSD system */
-#include <stdio.h>
-
-FILE *  port_access_handle = NULL ;
-
-static inline int
-port_access (unsigned short int port)
-{
 	if( port_access_handle
 	    || (port_access_handle = fopen("/dev/io", "rw")) != NULL ) {
-		return( 0 );  /* Success */
+		return( 0 );  // Success
 	} else {
-		return( -1 );  /* Failure */
+		return( -1 );  // Failure
 	};
+	
+	return -1;
 }
+
+// Get access to a specific port
+static inline int port_access (unsigned short int port) {
+	return port_access_full(port); // /dev/io gives you access to all ports.
+}
+
 #endif

+/*
 #else
 #include <pc.h>

@@ -80,6 +183,6 @@ port_out (unsigned int port, unsigned char val)
 	outportb ((unsigned short) port, val);
 }
 #endif
+*/

-/**** END OF FILE ****/
-#endif
+#endif // PORT_H