From 2d4ec8662e580df39073315dcb2d6698f60cb47a Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Sun, 8 Jan 2006 06:38:39 +0000
Subject: [PATCH] - Bless halxbox too.

svn path=/trunk/; revision=20698
---
 reactos/hal/halx86/xbox/display_xbox.c | 13 +++++++------
 reactos/hal/halx86/xbox/font.c         |  9 +++------
 reactos/hal/halx86/xbox/halinit_xbox.c |  8 ++------
 reactos/hal/halx86/xbox/halxbox.h      |  5 ++++-
 reactos/hal/halx86/xbox/halxbox.xml    |  1 +
 reactos/hal/halx86/xbox/part_xbox.c    | 10 +++-------
 reactos/hal/halx86/xbox/pci_xbox.c     |  9 ++-------
 7 files changed, 22 insertions(+), 33 deletions(-)

diff --git a/reactos/hal/halx86/xbox/display_xbox.c b/reactos/hal/halx86/xbox/display_xbox.c
index b656af17fef..d9c7cd39013 100644
--- a/reactos/hal/halx86/xbox/display_xbox.c
+++ b/reactos/hal/halx86/xbox/display_xbox.c
@@ -12,9 +12,10 @@
 
 /* For an explanation about display ownership see generic/display.c */
 
-#include <ntddk.h>
-#include <hal.h>
-#include "halxbox.h"
+#include <halxbox.h>
+
+#define NDEBUG
+#include <debug.h>
 
 #define I2C_IO_BASE 0xc000
 
@@ -152,7 +153,7 @@ HalClearDisplay(UCHAR CharAttribute)
   CursorY = 0;
 }
 
-VOID STATIC
+VOID static
 HalScrollDisplay (VOID)
 {
   ULONG Line, Col;
@@ -198,7 +199,7 @@ HalPutCharacter(UCHAR Character)
   HalpXboxOutputChar(Character, CursorX, CursorY, DEFAULT_FG_COLOR, DEFAULT_BG_COLOR);
 }
 
-static BOOL
+static BOOLEAN
 ReadfromSMBus(UCHAR Address, UCHAR bRegister, UCHAR Size, ULONG *Data_to_smbus)
 {
   int nRetriesToLive=50;
@@ -276,7 +277,7 @@ ReadfromSMBus(UCHAR Address, UCHAR bRegister, UCHAR Size, ULONG *Data_to_smbus)
 }
 
 
-static BOOL
+static BOOLEAN
 I2CTransmitByteGetReturn(UCHAR bPicAddressI2cFormat, UCHAR bDataToWrite, ULONG *Return)
 {
   return ReadfromSMBus(bPicAddressI2cFormat, bDataToWrite, 1, Return);
diff --git a/reactos/hal/halx86/xbox/font.c b/reactos/hal/halx86/xbox/font.c
index 03472661687..cb168d659ea 100644
--- a/reactos/hal/halx86/xbox/font.c
+++ b/reactos/hal/halx86/xbox/font.c
@@ -11,15 +11,12 @@
  * Note: Converted from the XFree vga.bdf font
  */
 
+#include <halxbox.h>
+
 #define NDEBUG
-
-#include <ntddk.h>
-#include "halxbox.h"
-
-#include <internal/debug.h>
 #include <debug.h>
 
-BYTE XboxFont8x16[256 * 16] =
+CHAR XboxFont8x16[256 * 16] =
 {
   0x00,0x00,0x00,0x7c,0xc6,0xc6,0xde,0xde,0xde,0xdc,0xc0,0x7c,0x00,0x00,0x00,0x00, /* 0x00 */
   0x00,0x00,0x7e,0x81,0xa5,0x81,0x81,0xa5,0x99,0x81,0x81,0x7e,0x00,0x00,0x00,0x00, /* 0x01 */
diff --git a/reactos/hal/halx86/xbox/halinit_xbox.c b/reactos/hal/halx86/xbox/halinit_xbox.c
index 0d16ba4e2fa..863e8c52cdb 100644
--- a/reactos/hal/halx86/xbox/halinit_xbox.c
+++ b/reactos/hal/halx86/xbox/halinit_xbox.c
@@ -11,13 +11,9 @@
 
 /* INCLUDES *****************************************************************/
 
+#include <halxbox.h>
+
 #define NDEBUG
-
-#include <ntddk.h>
-#include <hal.h>
-#include "halxbox.h"
-
-#include <internal/debug.h>
 #include <debug.h>
 
 /* FUNCTIONS ***************************************************************/
diff --git a/reactos/hal/halx86/xbox/halxbox.h b/reactos/hal/halx86/xbox/halxbox.h
index 1b0cc14ded3..644da8d2cbd 100644
--- a/reactos/hal/halx86/xbox/halxbox.h
+++ b/reactos/hal/halx86/xbox/halxbox.h
@@ -12,7 +12,10 @@
 #ifndef HALXBOX_H_INCLUDED
 #define HALXBOX_H_INCLUDED
 
-extern BYTE XboxFont8x16[256 * 16];
+#include <hal.h>
+#include <ntdddisk.h>
+
+extern CHAR XboxFont8x16[256 * 16];
 
 void HalpXboxInitPciBus(ULONG BusNumber, PBUS_HANDLER BusHandler);
 void HalpXboxInitPartIo(void);
diff --git a/reactos/hal/halx86/xbox/halxbox.xml b/reactos/hal/halx86/xbox/halxbox.xml
index 1119703bae3..23cf90d419e 100644
--- a/reactos/hal/halx86/xbox/halxbox.xml
+++ b/reactos/hal/halx86/xbox/halxbox.xml
@@ -15,4 +15,5 @@
 	<file>part_xbox.c</file>
 	<file>pci_xbox.c</file>
 	<file>halxbox.rc</file>
+	<pch>halxbox.h</pch>
 </module>
diff --git a/reactos/hal/halx86/xbox/part_xbox.c b/reactos/hal/halx86/xbox/part_xbox.c
index 810c95c7e20..389c8f8e9c0 100644
--- a/reactos/hal/halx86/xbox/part_xbox.c
+++ b/reactos/hal/halx86/xbox/part_xbox.c
@@ -11,13 +11,9 @@
 
 /* INCLUDES *****************************************************************/
 
+#include <halxbox.h>
+
 #define NDEBUG
-
-#include <hal.h>
-#include <ntdddisk.h>
-#include "halxbox.h"
-
-#include <internal/debug.h>
 #include <debug.h>
 
 #define XBOX_SIGNATURE_SECTOR 3
@@ -35,7 +31,7 @@ static struct
 {
   ULONG SectorStart;
   ULONG SectorCount;
-  BYTE PartitionType;
+  CHAR PartitionType;
 } XboxPartitions[] =
 {
   /* This is in the \Device\Harddisk0\Partition.. order used by the Xbox kernel */
diff --git a/reactos/hal/halx86/xbox/pci_xbox.c b/reactos/hal/halx86/xbox/pci_xbox.c
index d9d81092cfe..671f757d25c 100644
--- a/reactos/hal/halx86/xbox/pci_xbox.c
+++ b/reactos/hal/halx86/xbox/pci_xbox.c
@@ -17,14 +17,9 @@
 
 /* INCLUDES *****************************************************************/
 
+#include <halxbox.h>
+
 #define NDEBUG
-
-#include <ntddk.h>
-#include <hal.h>
-#include <bus.h>
-#include "halxbox.h"
-
-#include <internal/debug.h>
 #include <debug.h>
 
 /* VARIABLES ***************************************************************/