xnu-792.24.17.tar.gz

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

diff --git a/osfmk/i386/pio.h b/osfmk/i386/pio.h
index a5de5df74b497a8e7aeb78d1383f40dbb165652d..c8b3b4a19862c1b8370c13fef9ae9d8e0c29cb04 100644 (file)
--- a/osfmk/i386/pio.h
+++ b/osfmk/i386/pio.h
@@ -1,29 +1,23 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *

- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_HEADER_START@

  * 
  * 

- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.

  * 
  * 

- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.

  * 
  * 

- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ * @APPLE_LICENSE_HEADER_END@

  */
 /*
  * @OSF_COPYRIGHT@
  */
 /*
  * @OSF_COPYRIGHT@


@@ -59,9 +53,6 @@
 #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 */


@@ -118,6 +109,51 @@ 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 */