Changed include/hal/io.h to halio.h with i386/io.h

svn path=/trunk/; revision=106

reactos/drivers/dd/keyboard/keyboard.c

@@ -22,7 +22,7 @@
 
 #undef WIN32_LEAN_AND_MEAN
 #include <internal/mmhal.h>
-#include <internal/hal/io.h>
+#include <internal/halio.h>
 #include <ddk/ntddk.h>
 #include <internal/string.h>
 #include <defines.h>

reactos/drivers/dd/mouse/mouse.c

@@ -12,8 +12,8 @@
 */
 
 #include <internal/mmhal.h>
-#include <internal/hal/io.h>
-#include <internal/hal/ddk.h>
+#include <internal/halio.h>
+/* #include <internal/hal/ddk.h> */
 #include <funcs.h>
 
 #define MOUSE_IRQ_COM1  4

reactos/drivers/dd/sdisk/sdisk.c

@@ -10,7 +10,7 @@
 /* INCLUDES ****************************************************************/
 
 #include <ddk/ntddk.h>
-#include <internal/hal/io.h>
+#include <internal/halio.h>
 
 #define NDEBUG
 #include <internal/debug.h>

reactos/drivers/dd/serial/serial.c

@@ -7,7 +7,7 @@
 */
 
 #include <internal/mmhal.h>
-#include <internal/hal/io.h>
+#include <internal/halio.h>
 
 #define COM1    0x3F8
 #define COM2    0x2F8

reactos/drivers/dd/sound/sound.c

@@ -12,7 +12,7 @@
 
 /* FUNCTIONS **************************************************************/
 
-#include <internal/hal/io.h>
+#include <internal/halio.h>
 #include <ddk/ntddk.h>
 #include <internal/hal/ddk.h>
 #include <internal/dma.h>

reactos/drivers/dd/test1/test.c

@@ -13,7 +13,7 @@
 
 #include <windows.h>
 #include <internal/kernel.h>
-#include <internal/hal/io.h>
+#include <internal/halio.h>
 #include <ddk/ntddk.h>
 #include <string.h>
 #include <internal/debug.h>

reactos/include/internal/dma.h

@@ -1,4 +1,4 @@
-/* $Id: dma.h,v 1.3 1998/08/25 04:48:36 rex Exp $
+/* $Id: dma.h,v 1.4 1998/11/29 19:39:40 rex Exp $
  * linux/include/asm/dma.h: Defines for using and allocating dma channels.
  * Written by Hennus Bergman, 1992.
  * High DMA channel support & info by Hannu Savolainen
@@ -8,7 +8,7 @@
 #ifndef _ASM_DMA_H
 #define _ASM_DMA_H
 
-#include <internal/hal/io.h>             /* need byte IO */
+#include <internal/halio.h>             /* need byte IO */
 
 
 #ifdef HAVE_REALLY_SLOW_DMA_CONTROLLER

reactos/include/internal/halio.h

@@ -0,0 +1,11 @@
+#ifndef __INCLUDE_INTERNAL_HALIO_H
+#define __INCLUDE_INTERNAL_HALIO_H
+
+#ifdef i386
+#include <internal/i386/io.h>
+#else
+#error "Unknown processor"
+#endif
+
+#endif
+

reactos/ntoskrnl/hal/x86/irq.c

@@ -27,7 +27,7 @@
 #include <internal/string.h>
 
 #include <internal/i386/segment.h>
-#include <internal/hal/io.h>
+#include <internal/halio.h>
 
 #define NDEBUG
 #include <internal/debug.h>

reactos/ntoskrnl/hal/x86/irql.c

@@ -11,7 +11,7 @@
 #include <windows.h>
 #include <ddk/ntddk.h>
 #include <internal/bitops.h>
-#include <internal/hal/io.h>
+#include <internal/halio.h>
 
 #define NDEBUG
 #include <internal/debug.h>

reactos/ntoskrnl/hal/x86/printk.c

@@ -14,7 +14,7 @@
 #include <internal/ntoskrnl.h>
 #include <internal/string.h>
 #include <internal/mmhal.h>
-#include <internal/hal/io.h>
+#include <internal/halio.h>
 
 //#define BOCHS_DEBUGGING 1
 //#define SERIAL_DEBUGGING