Merge branch 'master' of git://git.ucc.asn.au/tpg/acess2

[tpg/acess2.git] / KernelLand / Modules / Display / BochsGA / bochsvbe.c

diff --git a/KernelLand/Modules/Display/BochsGA/bochsvbe.c b/KernelLand/Modules/Display/BochsGA/bochsvbe.c
index 4e0e600..5988ee7 100644 (file)
--- a/KernelLand/Modules/Display/BochsGA/bochsvbe.c
+++ b/KernelLand/Modules/Display/BochsGA/bochsvbe.c
@@ -47,8 +47,6 @@ enum {
        VBE_DISPI_INDEX_Y_OFFSET\r
 };\r
 \r
-extern void MM_DumpTables(tVAddr Start, tVAddr End);\r
-\r
 // === PROTOTYPES ===\r
 // Driver\r
  int   BGA_Install(char **Arguments);\r
@@ -103,6 +101,10 @@ int BGA_Install(char **Arguments)
        // Check BGA Version\r
        version = BGA_int_ReadRegister(VBE_DISPI_INDEX_ID);\r
        LOG("version = 0x%x", version);\r
+       if( version == 0xFFFF ) {\r
+               // Floating bus, nothing there\r
+               return MODULE_ERR_NOTNEEDED;\r
+       }\r
        \r
        // NOTE: This driver was written for BGA versions >= 0xBOC2\r
        // NOTE: However, Qemu is braindead and doesn't return the actual version\r
@@ -217,6 +219,10 @@ int BGA_IOCtl(tVFS_Node *Node, int ID, void *Data)
                                gBGA_CursorPos.x, gBGA_CursorPos.y\r
                                );\r
                break;\r
+\r
+       case VIDEO_IOCTL_SETCURSORBITMAP:\r
+               DrvUtil_Video_SetCursor( &gBGA_DrvUtil_BufInfo, Data );\r
+               return 0;\r
        \r
        default:\r
                LEAVE('i', -2);\r