[ros-diffs] [ion] 20698: - Bless halxbox too.

[ion at svn.reactos.org]

- Bless halxbox too.
Modified: trunk/reactos/hal/halx86/xbox/display_xbox.c
Modified: trunk/reactos/hal/halx86/xbox/font.c
Modified: trunk/reactos/hal/halx86/xbox/halinit_xbox.c
Modified: trunk/reactos/hal/halx86/xbox/halxbox.h
Modified: trunk/reactos/hal/halx86/xbox/halxbox.xml
Modified: trunk/reactos/hal/halx86/xbox/part_xbox.c
Modified: trunk/reactos/hal/halx86/xbox/pci_xbox.c
  _____  

Modified: trunk/reactos/hal/halx86/xbox/display_xbox.c
--- trunk/reactos/hal/halx86/xbox/display_xbox.c	2006-01-08
06:30:00 UTC (rev 20697)
+++ trunk/reactos/hal/halx86/xbox/display_xbox.c	2006-01-08
06:38:39 UTC (rev 20698)
@@ -12,10 +12,11 @@

 
 /* 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
 
 #define CONTROL_FRAMEBUFFER_ADDRESS_OFFSET 0x600800
@@ -152,7 +153,7 @@
   CursorY = 0;
 }
 
-VOID STATIC
+VOID static
 HalScrollDisplay (VOID)
 {
   ULONG Line, Col;
@@ -198,7 +199,7 @@
   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 @@
 }
 
 
-static BOOL
+static BOOLEAN
 I2CTransmitByteGetReturn(UCHAR bPicAddressI2cFormat, UCHAR
bDataToWrite, ULONG *Return)
 {
   return ReadfromSMBus(bPicAddressI2cFormat, bDataToWrite, 1, Return);
  _____  

Modified: trunk/reactos/hal/halx86/xbox/font.c
--- trunk/reactos/hal/halx86/xbox/font.c	2006-01-08 06:30:00 UTC
(rev 20697)
+++ trunk/reactos/hal/halx86/xbox/font.c	2006-01-08 06:38:39 UTC
(rev 20698)
@@ -11,15 +11,12 @@

  * Note: Converted from the XFree vga.bdf font
  */
 
-#define NDEBUG
+#include <halxbox.h>
 
-#include <ntddk.h>
-#include "halxbox.h"
-
-#include <internal/debug.h>
+#define NDEBUG
 #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,0x
00,0x00, /* 0x00 */
 
0x00,0x00,0x7e,0x81,0xa5,0x81,0x81,0xa5,0x99,0x81,0x81,0x7e,0x00,0x00,0x
00,0x00, /* 0x01 */
  _____  

Modified: trunk/reactos/hal/halx86/xbox/halinit_xbox.c
--- trunk/reactos/hal/halx86/xbox/halinit_xbox.c	2006-01-08
06:30:00 UTC (rev 20697)
+++ trunk/reactos/hal/halx86/xbox/halinit_xbox.c	2006-01-08
06:38:39 UTC (rev 20698)
@@ -11,13 +11,9 @@

 
 /* INCLUDES
*****************************************************************/
 
-#define NDEBUG
+#include <halxbox.h>
 
-#include <ntddk.h>
-#include <hal.h>
-#include "halxbox.h"
-
-#include <internal/debug.h>
+#define NDEBUG
 #include <debug.h>
 
 /* FUNCTIONS
***************************************************************/
  _____  

Modified: trunk/reactos/hal/halx86/xbox/halxbox.h
--- trunk/reactos/hal/halx86/xbox/halxbox.h	2006-01-08 06:30:00 UTC
(rev 20697)
+++ trunk/reactos/hal/halx86/xbox/halxbox.h	2006-01-08 06:38:39 UTC
(rev 20698)
@@ -12,8 +12,11 @@

 #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);
 
  _____  

Modified: trunk/reactos/hal/halx86/xbox/halxbox.xml
--- trunk/reactos/hal/halx86/xbox/halxbox.xml	2006-01-08 06:30:00 UTC
(rev 20697)
+++ trunk/reactos/hal/halx86/xbox/halxbox.xml	2006-01-08 06:38:39 UTC
(rev 20698)
@@ -15,4 +15,5 @@

 	<file>part_xbox.c</file>
 	<file>pci_xbox.c</file>
 	<file>halxbox.rc</file>
+	<pch>halxbox.h</pch>
 </module>
  _____  

Modified: trunk/reactos/hal/halx86/xbox/part_xbox.c
--- trunk/reactos/hal/halx86/xbox/part_xbox.c	2006-01-08 06:30:00 UTC
(rev 20697)
+++ trunk/reactos/hal/halx86/xbox/part_xbox.c	2006-01-08 06:38:39 UTC
(rev 20698)
@@ -11,13 +11,9 @@

 
 /* INCLUDES
*****************************************************************/
 
-#define NDEBUG
+#include <halxbox.h>
 
-#include <hal.h>
-#include <ntdddisk.h>
-#include "halxbox.h"
-
-#include <internal/debug.h>
+#define NDEBUG
 #include <debug.h>
 
 #define XBOX_SIGNATURE_SECTOR 3
@@ -35,7 +31,7 @@
 {
   ULONG SectorStart;
   ULONG SectorCount;
-  BYTE PartitionType;
+  CHAR PartitionType;
 } XboxPartitions[] =
 {
   /* This is in the \Device\Harddisk0\Partition.. order used by the
Xbox kernel */
  _____  

Modified: trunk/reactos/hal/halx86/xbox/pci_xbox.c
--- trunk/reactos/hal/halx86/xbox/pci_xbox.c	2006-01-08 06:30:00 UTC
(rev 20697)
+++ trunk/reactos/hal/halx86/xbox/pci_xbox.c	2006-01-08 06:38:39 UTC
(rev 20698)
@@ -17,14 +17,9 @@

 
 /* INCLUDES
*****************************************************************/
 
-#define NDEBUG
+#include <halxbox.h>
 
-#include <ntddk.h>
-#include <hal.h>
-#include <bus.h>
-#include "halxbox.h"
-
-#include <internal/debug.h>
+#define NDEBUG
 #include <debug.h>
 
 /* VARIABLES
***************************************************************/
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://www.reactos.org/pipermail/ros-diffs/attachments/20060108/6fc89184/attachment.html