X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Modules%2FDisplay%2FBochsGA%2Fbochsvbe.c;h=1ed46ccb4979f314d091872684f25f3380abb278;hb=54746c855c6e2fe42fde9f93b0ce3f41aeefc2e5;hp=06d362cb2182add0de12c259b0bdca4406b5bd86;hpb=0dbc91f0676576b954aa95dafdb434ce19bc805c;p=tpg%2Facess2.git diff --git a/Modules/Display/BochsGA/bochsvbe.c b/Modules/Display/BochsGA/bochsvbe.c index 06d362cb..1ed46ccb 100644 --- a/Modules/Display/BochsGA/bochsvbe.c +++ b/Modules/Display/BochsGA/bochsvbe.c @@ -1,7 +1,6 @@ /** * \file drv_bochsvbe.c - * \brief BGA (Bochs Graphic Adapter) Driver - * \note for Acess2 + * \brief BGA (Bochs Graphic Adapter) Driver for Acess2 * \warning This driver does NOT support the Bochs PCI VGA driver */ #define DEBUG 0 @@ -15,7 +14,7 @@ #define INT -// === TYPEDEFS === +// === TYPES === typedef struct { Uint16 width; Uint16 height; @@ -70,7 +69,7 @@ Uint64 BGA_Write(tVFS_Node *node, Uint64 off, Uint64 len, void *buffer); int BGA_Ioctl(tVFS_Node *node, int id, void *data); // === GLOBALS === -MODULE_DEFINE(0, 0x0032, BochsGA, BGA_Install, NULL, NULL); +MODULE_DEFINE(0, 0x0032, BochsGA, BGA_Install, NULL, "PCI", NULL); tDevFS_Driver gBGA_DriverStruct = { NULL, "BochsGA", { @@ -107,20 +106,20 @@ int BGA_Install(char **Arguments) // NOTE: This driver was written for 0xB0C4, but they seem to be backwards compatable if(bga_version < 0xB0C4 || bga_version > 0xB0C5) { Warning("[BGA ] Bochs Adapter Version is not 0xB0C4 or 0xB0C5, instead 0x%x", bga_version); - return 0; + return MODULE_ERR_NOTNEEDED; } // Install Device giBGA_DriverId = DevFS_AddDevice( &gBGA_DriverStruct ); if(giBGA_DriverId == -1) { Warning("[BGA ] Unable to register with DevFS, maybe already loaded?"); - return 0; + return MODULE_ERR_MISC; } // Map Framebuffer to hardware address gBGA_Framebuffer = (void *) MM_MapHWPage(VBE_DISPI_LFB_PHYSICAL_ADDRESS, 768); // 768 pages (3Mb) - return 1; + return MODULE_ERR_OK; } /**