- Bless halxbox too.

svn path=/trunk/; revision=20698
This commit is contained in:
Alex Ionescu 2006-01-08 06:38:39 +00:00
parent 9afb713356
commit 2d4ec8662e
7 changed files with 22 additions and 33 deletions

View file

@ -12,9 +12,10 @@
/* For an explanation about display ownership see generic/display.c */ /* For an explanation about display ownership see generic/display.c */
#include <ntddk.h> #include <halxbox.h>
#include <hal.h>
#include "halxbox.h" #define NDEBUG
#include <debug.h>
#define I2C_IO_BASE 0xc000 #define I2C_IO_BASE 0xc000
@ -152,7 +153,7 @@ HalClearDisplay(UCHAR CharAttribute)
CursorY = 0; CursorY = 0;
} }
VOID STATIC VOID static
HalScrollDisplay (VOID) HalScrollDisplay (VOID)
{ {
ULONG Line, Col; ULONG Line, Col;
@ -198,7 +199,7 @@ HalPutCharacter(UCHAR Character)
HalpXboxOutputChar(Character, CursorX, CursorY, DEFAULT_FG_COLOR, DEFAULT_BG_COLOR); 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) ReadfromSMBus(UCHAR Address, UCHAR bRegister, UCHAR Size, ULONG *Data_to_smbus)
{ {
int nRetriesToLive=50; 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) I2CTransmitByteGetReturn(UCHAR bPicAddressI2cFormat, UCHAR bDataToWrite, ULONG *Return)
{ {
return ReadfromSMBus(bPicAddressI2cFormat, bDataToWrite, 1, Return); return ReadfromSMBus(bPicAddressI2cFormat, bDataToWrite, 1, Return);

View file

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

View file

@ -11,13 +11,9 @@
/* INCLUDES *****************************************************************/ /* INCLUDES *****************************************************************/
#include <halxbox.h>
#define NDEBUG #define NDEBUG
#include <ntddk.h>
#include <hal.h>
#include "halxbox.h"
#include <internal/debug.h>
#include <debug.h> #include <debug.h>
/* FUNCTIONS ***************************************************************/ /* FUNCTIONS ***************************************************************/

View file

@ -12,7 +12,10 @@
#ifndef HALXBOX_H_INCLUDED #ifndef HALXBOX_H_INCLUDED
#define 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 HalpXboxInitPciBus(ULONG BusNumber, PBUS_HANDLER BusHandler);
void HalpXboxInitPartIo(void); void HalpXboxInitPartIo(void);

View file

@ -15,4 +15,5 @@
<file>part_xbox.c</file> <file>part_xbox.c</file>
<file>pci_xbox.c</file> <file>pci_xbox.c</file>
<file>halxbox.rc</file> <file>halxbox.rc</file>
<pch>halxbox.h</pch>
</module> </module>

View file

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

View file

@ -17,14 +17,9 @@
/* INCLUDES *****************************************************************/ /* INCLUDES *****************************************************************/
#include <halxbox.h>
#define NDEBUG #define NDEBUG
#include <ntddk.h>
#include <hal.h>
#include <bus.h>
#include "halxbox.h"
#include <internal/debug.h>
#include <debug.h> #include <debug.h>
/* VARIABLES ***************************************************************/ /* VARIABLES ***************************************************************/