Changeset 2049 for Whitix/trunk/user/xynth/src/server/video/bochs/server.c

Timestamp:

05/17/09 10:39:07 (3 years ago)

Author:

mwhitworth

Message:

Start updating Xynth to use dynamic libraries for drivers, remove old configuration code and replace with registry equivalents.

Files:

• Whitix/trunk/user/xynth/src/server/video/bochs/server.c (modified) (6 diffs)

Whitix/trunk/user/xynth/src/server/video/bochs/server.c

@@ -13 +13 @@
 #define VBE_DISPI_DATA          0x01CF
 
+#define VBE_DISPI_ID4           0xB0C4
+
+#define VBE_DISPI_ID            0x0
 #define VBE_DISPI_XRES          0x1
 #define VBE_DISPI_YRES          0x2
@@ -24 +27 @@
 #define outw(port,data) asm volatile("outw %%ax,%%dx"::"d"(port),"a"(data))
 
+static unsigned short inw(unsigned short port)
+{
+        unsigned short retVal;
+        asm volatile("inw %%dx,%%ax" : "=a"(retVal) : "d"(port));
+        return retVal;
+}
+
 extern int noGraphics;
 
-void VbeWrite(unsigned short index, unsigned short value)
+static unsigned short VbeRead(unsigned short index)
+{
+        outw(VBE_DISPI_INDEX, index);
+        
+        return inw(VBE_DISPI_DATA);
+}
+
+static void VbeWrite(unsigned short index, unsigned short value)
 {
         outw(VBE_DISPI_INDEX, index);
@@ -32 +49 @@
 }
 
-void VbeSetMode(unsigned short width, unsigned short height, unsigned short bits)
+static int VbeSetMode(unsigned short width, unsigned short height, unsigned short bits)
 {
         VbeWrite(VBE_DISPI_ENABLE, VBE_DISPI_DISABLED);
@@ -39 +56 @@
         VbeWrite(VBE_DISPI_BPP, bits);
         VbeWrite(VBE_DISPI_ENABLE, VBE_DISPI_ENABLED | VBE_DISPI_LFB_ENABLED);
+        
+        return 0;
 }
 
-int s_video_bochs_server_init (s_server_conf_t *cfg)
+int s_video_bochs_server_init (s_server_t* server)
 {
-        SysIoAccess(1);
+        if (VbeSetMode(BOCHS_WIDTH, BOCHS_HEIGHT, BOCHS_BPP))
+                        return -1;
+                        
+        server->window->surface->width=BOCHS_WIDTH;
 
-        if (!noGraphics)
-                VbeSetMode(BOCHS_WIDTH, BOCHS_HEIGHT, BOCHS_BPP);
-
-        server->window->surface->width=BOCHS_WIDTH;
         server->window->surface->height=BOCHS_HEIGHT;
         server->window->surface->bytesperpixel=BOCHS_BPP/8;
@@ -60 +78 @@
         server->window->surface->redlength = 8;
 
-        int memFd=SysOpen("/System/Devices/Special/Memory", _SYS_FILE_READ | _SYS_FILE_WRITE, 0);
+        int memFd = SysOpen("/System/Devices/Special/Memory", _SYS_FILE_READ | _SYS_FILE_WRITE, 0);
 
         server->window->surface->linear_mem_size=server->window->surface->width*server->window->surface->height*server->window->surface->bytesperpixel;
@@ -80 +98 @@
 }
 
-s_video_driver_t s_video_bochs = {
+int BochsProbe(s_server_t* server)
+{
+        if (VbeRead(VBE_DISPI_ID) != VBE_DISPI_ID4)
+                return 0;
+                
+        return 1;
+}
+
+s_video_driver_t videoDriver = {
         "bochs",
         "/System/Devices/Special/Memory",
         s_video_bochs_server_init,
         s_video_bochs_server_uninit,
+        BochsProbe,
 };