From 82d21c903e1067651fbf72efc831f2d6adfa18a0 Mon Sep 17 00:00:00 2001
From: Rex Jolliff <rex@lvcablemodem.com>
Date: Sun, 29 Nov 1998 19:39:40 +0000
Subject: [PATCH] Changed include/hal/io.h to halio.h with i386/io.h

svn path=/trunk/; revision=106
---
 reactos/drivers/dd/keyboard/keyboard.c             |  2 +-
 reactos/drivers/dd/mouse/mouse.c                   |  4 ++--
 reactos/drivers/dd/sdisk/sdisk.c                   |  2 +-
 reactos/drivers/dd/serial/serial.c                 |  2 +-
 reactos/drivers/dd/sound/sound.c                   |  2 +-
 reactos/drivers/dd/test1/test.c                    |  2 +-
 reactos/include/internal/dma.h                     |  4 ++--
 reactos/include/internal/halio.h                   | 11 +++++++++++
 reactos/include/internal/{hal => i386}/segment.inc |  0
 reactos/ntoskrnl/hal/x86/irq.c                     |  2 +-
 reactos/ntoskrnl/hal/x86/irql.c                    |  2 +-
 reactos/ntoskrnl/hal/x86/printk.c                  |  2 +-
 12 files changed, 23 insertions(+), 12 deletions(-)
 create mode 100644 reactos/include/internal/halio.h
 rename reactos/include/internal/{hal => i386}/segment.inc (100%)

diff --git a/reactos/drivers/dd/keyboard/keyboard.c b/reactos/drivers/dd/keyboard/keyboard.c
index d4cc587578e..8fe32ae4313 100644
--- a/reactos/drivers/dd/keyboard/keyboard.c
+++ b/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>
diff --git a/reactos/drivers/dd/mouse/mouse.c b/reactos/drivers/dd/mouse/mouse.c
index 6afb23c87bb..caad08eda9a 100644
--- a/reactos/drivers/dd/mouse/mouse.c
+++ b/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
diff --git a/reactos/drivers/dd/sdisk/sdisk.c b/reactos/drivers/dd/sdisk/sdisk.c
index 518b6c3a1ed..729d2ddcd33 100644
--- a/reactos/drivers/dd/sdisk/sdisk.c
+++ b/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>
diff --git a/reactos/drivers/dd/serial/serial.c b/reactos/drivers/dd/serial/serial.c
index 8241c7cab0c..c281c387497 100644
--- a/reactos/drivers/dd/serial/serial.c
+++ b/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
diff --git a/reactos/drivers/dd/sound/sound.c b/reactos/drivers/dd/sound/sound.c
index 9fcca25920b..6feffc84e19 100644
--- a/reactos/drivers/dd/sound/sound.c
+++ b/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>
diff --git a/reactos/drivers/dd/test1/test.c b/reactos/drivers/dd/test1/test.c
index b74037a9bf7..b071e2f0d69 100644
--- a/reactos/drivers/dd/test1/test.c
+++ b/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>
diff --git a/reactos/include/internal/dma.h b/reactos/include/internal/dma.h
index 236a9b16fee..4aa0f1762c1 100644
--- a/reactos/include/internal/dma.h
+++ b/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
diff --git a/reactos/include/internal/halio.h b/reactos/include/internal/halio.h
new file mode 100644
index 00000000000..6510b5e25d5
--- /dev/null
+++ b/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
+
diff --git a/reactos/include/internal/hal/segment.inc b/reactos/include/internal/i386/segment.inc
similarity index 100%
rename from reactos/include/internal/hal/segment.inc
rename to reactos/include/internal/i386/segment.inc
diff --git a/reactos/ntoskrnl/hal/x86/irq.c b/reactos/ntoskrnl/hal/x86/irq.c
index 7e701a4664d..7fa8ffa4cdb 100644
--- a/reactos/ntoskrnl/hal/x86/irq.c
+++ b/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>
diff --git a/reactos/ntoskrnl/hal/x86/irql.c b/reactos/ntoskrnl/hal/x86/irql.c
index 122022ff28b..94266d5391b 100644
--- a/reactos/ntoskrnl/hal/x86/irql.c
+++ b/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>
diff --git a/reactos/ntoskrnl/hal/x86/printk.c b/reactos/ntoskrnl/hal/x86/printk.c
index 6d7948b2544..0c96c618a11 100644
--- a/reactos/ntoskrnl/hal/x86/printk.c
+++ b/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