forked from Lainports/freebsd-ports
29 lines
1.2 KiB
C
29 lines
1.2 KiB
C
--- src/ioports.c.orig Mon Nov 17 19:15:57 2003
|
|
+++ src/ioports.c Mon Nov 17 19:39:35 2003
|
|
@@ -107,7 +107,7 @@
|
|
}
|
|
#endif /* 0 */ /* __MACOSX__ */
|
|
|
|
-#if defined(__I386__) && defined(HAVE_ASM_IO_H) && defined(HAVE_SYS_PERM_H) || defined(__ALPHA__) || defined(__BSD__)
|
|
+#if defined(__I386__) && defined(HAVE_ASM_IO_H) && defined(HAVE_SYS_PERM_H) || defined(__ALPHA__) || (defined(__BSD__) && defined(__I386__))
|
|
static int linux_asm_read_io(unsigned int addr)
|
|
{
|
|
return inb(addr);
|
|
@@ -208,7 +208,7 @@
|
|
{
|
|
#if defined(__I386__) && defined(HAVE_ASM_IO_H) && defined(HAVE_SYS_PERM_H) || defined(__ALPHA__) || defined(__BSD__) || defined(__MACOSX__)
|
|
|
|
-#ifndef __MACOSX__
|
|
+#if !(defined(__MACOSX__) || (defined(__BSD__) && !defined(__I386__)))
|
|
if (method & IOM_ASM) {
|
|
io_rd = linux_asm_read_io;
|
|
io_wr = linux_asm_write_io;
|
|
@@ -417,7 +417,7 @@
|
|
int io_close(unsigned long from, unsigned long num)
|
|
{
|
|
#if defined(__I386__) && defined(HAVE_ASM_IO_H) && defined(HAVE_SYS_PERM_H) || defined(__ALPHA__) || defined(__BSD__) || defined(__MACOSX__)
|
|
-#ifndef __MACOSX__
|
|
+#if !(defined(__MACOSX__) || (defined(__BSD__) && !defined(__I386__)))
|
|
if (method & IOM_ASM)
|
|
#ifndef __BSD__
|
|
return (ioperm(from, num, 0) ? ERR_ROOT : 0);
|