xnu-1228.tar.gz

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

diff --git a/osfmk/i386/pio.h b/osfmk/i386/pio.h
index 14a4b5506a4d7b29db07bf4ef6bb8ecab924bc81..48cf259ae57430b6c9376e2d6078d60bae4c6c61 100644 (file)
--- a/osfmk/i386/pio.h
+++ b/osfmk/i386/pio.h
@@ -1,16 +1,19 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_OSREFERENCE_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. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * 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.
+ * 
+ * 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
@@ -20,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
@@ -54,9 +57,11 @@
  */
 #ifndef I386_PIO_H
 #define I386_PIO_H
-#include <cpus.h>
 #include <mach_assert.h>
 
+#if !MACH_ASSERT
+#include <architecture/i386/pio.h>
+#else
 typedef unsigned short i386_ioport_t;
 
 /* read a longword */
@@ -113,51 +118,6 @@ extern void                loutb(
                                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 */