xnu-792.18.15.tar.gz

[apple/xnu.git] / osfmk / i386 / pio.h

diff --git a/osfmk/i386/pio.h b/osfmk/i386/pio.h
index bd2f2f6b9e9493d79dd9673a87bc5d07b1b29bd5..a5de5df74b497a8e7aeb78d1383f40dbb165652d 100644 (file)
--- a/osfmk/i386/pio.h
+++ b/osfmk/i386/pio.h
@@ -59,6 +59,9 @@
 #define I386_PIO_H
 #include <mach_assert.h>
 
 #define I386_PIO_H
 #include <mach_assert.h>
 

+#if !MACH_ASSERT
+#include <architecture/i386/pio.h>
+#else

 typedef unsigned short i386_ioport_t;
 
 /* read a longword */
 typedef unsigned short i386_ioport_t;
 
 /* read a longword */


@@ -115,51 +118,6 @@ extern void                loutb(
                                i386_ioport_t   port,
                                char            * data,
                                int             count);
                                i386_ioport_t   port,
                                char            * data,
                                int             count);

+#endif /* !MACH_ASSERT */

 
 

-#if defined(__GNUC__) && (!MACH_ASSERT)
-extern __inline__ unsigned long        inl(
-                               i386_ioport_t port)
-{
-       unsigned long datum;
-       __asm__ volatile("inl %1, %0" : "=a" (datum) : "d" (port));
-       return(datum);
-}
-
-extern __inline__ unsigned short inw(
-                               i386_ioport_t port)
-{
-       unsigned short datum;
-       __asm__ volatile(".byte 0x66; inl %1, %0" : "=a" (datum) : "d" (port));
-       return(datum);
-}
-
-extern __inline__ unsigned char inb(
-                               i386_ioport_t port)
-{
-       unsigned char datum;
-       __asm__ volatile("inb %1, %0" : "=a" (datum) : "d" (port));
-       return(datum);
-}
-
-extern __inline__ void outl(
-                               i386_ioport_t port,
-                               unsigned long datum)
-{
-       __asm__ volatile("outl %0, %1" : : "a" (datum), "d" (port));
-}
-
-extern __inline__ void outw(
-                               i386_ioport_t port,
-                               unsigned short datum)
-{
-       __asm__ volatile(".byte 0x66; outl %0, %1" : : "a" (datum), "d" (port));
-}
-
-extern __inline__ void outb(
-                               i386_ioport_t port,
-                               unsigned char datum)
-{
-       __asm__ volatile("outb %0, %1" : : "a" (datum), "d" (port));
-}
-#endif /* defined(__GNUC__) && (!MACH_ASSERT) */

 #endif /* I386_PIO_H */
 #endif /* I386_PIO_H */