Changeset 2049 for Whitix

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.

Location:

Whitix/trunk/user/xynth/src/server

Files:

• Makefile (modified) (3 diffs)
• Makefile.depend (modified) (2 diffs)
• server.c (modified) (8 diffs)
• server.h (modified) (1 diff)
• video/bochs/server.c (modified) (6 diffs)
• video/vga/server.c (modified) (2 diffs)

Whitix/trunk/user/xynth/src/server/Makefile

@@ -4 +4 @@
 
 DIR = src/server/
+
+SUBDIR-Y = video/bochs/
+SUBDIR-Y = video/vga/
 
 INCDIR += . ../lib ../../../libc/include ../../../posix/include \
@@ -47 +50 @@
 CFLAGS-$(VIDEO_VGA)       += -I../../../../../librtl -I../../../../../libc/include -I../../../../../posix/include
 
-OBJS-$(VIDEO_BOCHS)        += video/bochs/server.o
-CFLAGS-$(VIDEO_BOCHS)     += -I../../../../../librtl -I../../../../../libc/include -I../../../../../posix/include
-
 OBJS-$(VIDEO_HELPER)      += video/helper/console.o video/helper/irman.o video/helper/kbd.o video/helper/modes.o \
                              video/helper/mouse.o video/helper/mtrr.o video/helper/tscreen.o
@@ -78 +78 @@
 OBJS       += $(OBJS-Y)
 EXTRA_OBJS += $(EXTRA_OBJS-Y)
-LDFLAGS    += -nostdlib -pthread -lstdc -lposix -lm  ../../../libc/init/init.o -lxynth -lpthread -ldl -llinker -lregistry -lnetwork -dynamic-linker=/System/Runtime/liblinker.so
+LDFLAGS    += -nostdlib -pthread -lstdc -lposix -lm  ../../../libc/init/init.o -lxynth -lpthread -ldl -llinker -lregistry -lnetwork -lfile -dynamic-linker=/System/Runtime/liblinker.so
 TARGET      = $(TARGET-Y)
 

Whitix/trunk/user/xynth/src/server/Makefile.depend

@@ -87 +87 @@
   ../../../posix/include/sys/un.h ../../../posix/include/netinet/in.h \
   ../../../posix/include/arpa/inet.h server.h \
-  ../../../sdk/include/registry.h ../../../posix/include/fcntl.h \
-  ../../../posix/include/sys/stat.h ../../../libc/include/syscalls.h \
-  ../../../libc/include/sysdefs.h ../../../posix/include/sys/shm.h \
-  ../../../posix/include/sys/ipc.h
+  ../../../sdk/include/registry.h ../../../sdk/include/file.h \
+  ../../../posix/include/fcntl.h ../../../posix/include/sys/stat.h \
+  ../../../libc/include/syscalls.h ../../../libc/include/sysdefs.h \
+  ../../../posix/include/sys/shm.h ../../../posix/include/sys/ipc.h
 socket.o: socket.c ../../../posix/include/sys/stat.h \
   ../../../posix/include/sys/time.h ../../../libc/include/time.h \
@@ -211 +211 @@
   server.h video/vga/vga.h ../../../libc/include/syscalls.h \
   ../../../libc/include/sysdefs.h
-video/bochs/server.o: video/bochs/server.c \
-  video/bochs/../../../lib/xynth_.h ../../../libc/include/stdio.h \
-  ../../../libc/include/errno.h ../../../libc/include/stddef.h \
-  ../../../libc/include/string.h ../../../libc/include/stdarg.h \
-  ../../../libc/include/stdlib.h ../../../libc/include/limits.h \
-  ../../../posix/include/unistd.h ../../../posix/include/sys/select.h \
-  ../../../posix/include/sys/types.h ../../../posix/include/sys/time.h \
-  ../../../libc/include/time.h ../../../posix/include/sys/resource.h \
-  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \
-  ../../../posix/include/sys/ucontext.h ../../../posix/include/getopt.h \
-  ../../../libc/include/stdint.h ../../../libc/include/inttypes.h \
-  ../../../libc/include/ctype.h video/bochs/../../../lib/xynth.h \
-  ../../../posix/include/sys/poll.h ../../../posix/include/sys/socket.h \
-  ../../../posix/include/sys/un.h ../../../posix/include/netinet/in.h \
-  ../../../posix/include/arpa/inet.h server.h \
-  ../../../libc/include/syscalls.h ../../../libc/include/sysdefs.h

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

@@ -18 +18 @@
 
 #include <registry.h>
+#include <file.h>
 
 #if defined(PLATFORM_LINUX)
@@ -25 +26 @@
 #include <sys/shm.h>
 
-#if defined(VIDEO_BOCHS)
-        extern s_video_driver_t s_video_bochs;
-#endif
-
-#if defined(VIDEO_VGA)
-        extern s_video_driver_t s_video_vga;
-#endif
-
-static s_video_driver_t *video_drivers[] = {
-#if defined(VIDEO_BOCHS)
-        &s_video_bochs,
-#endif
-#if defined(VIDEO_VGA)
-        &s_video_vga,
-#endif
-        NULL,
-};
+/* dl handle of the driver. */
+void* driverLibrary;
 
 int s_server_cfg_check_digit (char *ptr, char *digits)
@@ -76 +62 @@
 }
 
-int BlazeServerConfig(s_server_conf_t* config)
+int BlazeServerConfigRead(s_server_conf_t *config)
 {
         /* Open the registry and read the configuration methodically. */
         struct Registry registry;
         struct RegKeySet keySet;
-        
-        RegRegistryOpen(NULL, &registry);
+        char* str = NULL, *mouseType;
+        
+        if (RegRegistryOpen(NULL, &registry))
+                debugf(DSER | DFAT, "failed to open registry");
         
         /* Video. */
-        RegKeySetOpen(&registry, "/Applications/Xynth/Video", 0, &keySet);
-        
-        RegKeyReadString(&keySet, "driver", &config->general.driver, NULL);
-        
+        if (RegKeySetOpen(&registry, "/Applications/Xynth/Video", 0, &keySet))
+                debugf(DSER | DFAT, "failed to open video keyset");
+        
+        if (RegKeyReadString(&keySet, "driver", &str, NULL))
+                debugf(DSER | DFAT, "failed to read driver key");
+                
+        config->general.driver = str;
+        
+        /* TODO: Read mode. */
+        
+        RegKeySetClose(&keySet);
+                
+        /* Input devices */
+        if (RegKeySetOpen(&registry, "/Applications/Xynth/Input", 0, &keySet))
+                debugf(DSER | DFAT, "failed to open input keyset");
+
+        str = NULL;
+
+        if (RegKeyReadString(&keySet, "mouseType", &str, NULL))
+                debugf(DSER | DFAT, "failed to read mouse type key");
+                                
+        config->mouse.type = str;
+        
+        str = NULL;
+        
+        if (RegKeyReadString(&keySet, "kbdType", &str, NULL))
+                debugf(DSER | DFAT, "failed to read keyboard type key");
+
+        RegKeySetClose(&keySet);
+                
         RegRegistryClose(&registry);
-}
-
+        
+        return 0;
+}
+
+/* TODO: Don't need config parameter. */
+int BlazeLoadVideoDriver(char* driverName)
+{
+        char name[128];
+        s_video_driver_t* driverInfo;
+        int secondTime = 0;
+                        
+        snprintf(name, 128, "/Applications/Xynth/Drivers/%s", driverName);
+
+        /* FIXME: Remove soon. */
+        SysIoAccess(1);
+
+        driverLibrary = dlopen(name, 0);
+        
+        if (!driverLibrary)
+                debugf(DSER | DFAT, "failed to open video driver");
+                
+        driverInfo = dlsym(driverLibrary, "videoDriver");
+        
+        if (!driverInfo)
+                debugf(DSER | DFAT, "invalid video driver");
+        
+        if (driverInfo->probe)
+                if (!driverInfo->probe(server))
+                        return 1;               
+        
+        /* Call the start function for the video driver; it sets the resolution
+         * to the values specified in the configuration. */
+        if (driverInfo->server_init)
+        {
+                if ((driverInfo->server_init(server) < 0))
+                        return 1;
+        }else
+                debugf(DSER | DFAT, "invalid video driver");
+
+        server->driver = driverInfo;
+
+        return 0;
+}
+
+/* TODO: Load the vga driver if all else fails? */
 int s_server_cfg (s_server_conf_t *config)
 {
-        int ret = 0;
-        
+        BlazeServerConfigRead(config);
+        
+        if (strlen(config->general.driver) == 0)
+        {
+                char* name;
+                struct FileDirectory* dir;
+                struct FileDirEnt* ent;
+                
+                dir = FileDirOpen("/Applications/Xynth/Drivers/");
+                
+                while ( ( ent = FileDirNext(dir) ) )
+                {
+                        name = ent->name;
+                        
+                        if (name[0] == '.' || !strcmp(name, "vga.so"))
+                                continue;
+                        
+                        if (!BlazeLoadVideoDriver(name))
+                                break;
+                }
+                
+                if (!ent && BlazeLoadVideoDriver("vga.so"))
+                {
+                        debugf(DSER | DFAT, "failed to find a valid video driver.");                            
+                }
+                
+                FileDirClose(dir);
+        
+        }else{
+                char buffer[256];
+                strncpy(buffer, config->general.driver, 250);
+                strcat(buffer, ".so");
+                BlazeLoadVideoDriver(config->general.driver);
+        }
+        
+        return 0;
+}
+
+int s_server_init (void)
+{
         int i;
-        int j;
-        s_config_t *cfg;
-        s_config_cat_t *cat;
-        s_config_var_t *var;
-
-        s_config_init(&cfg);
-        if (s_config_parse(cfg, CONFDIR "xynth.conf")) {
-                debugf(DSER, "Configuration file parsing failed (%s)", CONFDIR "xynth.conf");
-                s_config_uninit(cfg);
-                return -1;
-        }
-
-        i = 0;
-        while (!s_list_eol(cfg->category, i)) {
-                cat = s_list_get(cfg->category, i++);
-                j = 0;
-                while (!s_list_eol(cat->variable, j)) {
-                        var = s_list_get(cat->variable, j++);
-                        if (strcasecmp(cat->name, "general") == 0) {
-                                if (strcasecmp(var->name, "driver") == 0) {
-                                        config->general.driver = strdup(var->value);
-                                } else if (strcasecmp(var->name, "mode") == 0) {
-                                        config->general.mode = strdup(var->value);
-                                } else if (strcasecmp(var->name, "rotate") == 0) {
-                                        config->general.rotate = atoi(var->value);
-                                }
-                        } else if (strcasecmp(cat->name, "mouse") == 0) {
-                                if (strcasecmp(var->name, "type") == 0) {
-                                        config->mouse.type = strdup(var->value);
-                                } else if (strcasecmp(var->name, "device") == 0) {
-                                        config->mouse.device = strdup(var->value);
-                                } else if (strcasecmp(var->name, "samplerate") == 0) {
-                                        config->mouse.samplerate = atoi(var->value);
-                                } else if (strcasecmp(var->name, "scale") == 0) {
-                                        config->mouse.scale = atoi(var->value);
-                                        if (config->mouse.scale == 0) {
-                                                config->mouse.scale = 1;
-                                        }
-                                }
-                        } else if (strcasecmp(cat->name, "keyboard") == 0) {
-                                if (strcasecmp(var->name, "keyboard") == 0) {
-                                        config->keyboard.keyboard = strdup(var->value);
-                                }
-                        }else if (strcasecmp(cat->name, "monitor") == 0) {
-                                char *ptr;
-                                char *nptr;
-                                char *nptr_;
-                                char digits[] = ".0123456789";
-                                if (strcasecmp(var->name, "horizsync") == 0) {
-                                        nptr = strdup(var->value);
-                                        nptr_ = nptr;
-                                        ptr = s_server_cfg_token(&nptr);
-                                        if (s_server_cfg_check_digit(ptr, digits)) {
-                                                config->monitor.horizsync_min = atof(ptr);
-                                        } else {
-                                                goto hs_bad;
-                                        }
-                                        ptr = s_server_cfg_token(&nptr);
-                                        if (s_server_cfg_check_digit(ptr, digits)) {
-                                                config->monitor.horizsync_max = atof(ptr);
-                                        } else {
-hs_bad:                                         debugf(DSER, "Illegal horizsync setting. Correct usage: horizsync min_kHz max_kHz\n");
-                                                ret = -1;
-                                        }
-                                        s_free(nptr_);
-                                } else if (strcasecmp(var->name, "vertrefresh") == 0) {
-                                        nptr = strdup(var->value);
-                                        nptr_ = nptr;
-                                        ptr = s_server_cfg_token(&nptr);
-                                        if (s_server_cfg_check_digit(ptr, digits)) {
-                                                config->monitor.vertrefresh_min = atof(ptr);
-                                        } else {
-                                                goto vr_bad;
-                                        }
-                                        ptr = s_server_cfg_token(&nptr);
-                                        if (s_server_cfg_check_digit(ptr, digits)) {
-                                                config->monitor.vertrefresh_max = atof(ptr);
-                                        } else {
-vr_bad:                                         debugf(DSER, "Illegal vertrefresh setting. Correct usage: vertrefresh min_Hz max_Hz\n");
-                                                ret = -1;
-                                        }
-                                        s_free(nptr_);
-                                } else if (strcasecmp(var->name, "timing") == 0) {
-                                        nptr = strdup(var->value);
-                                        nptr_ = nptr;
-                                        ptr = s_server_cfg_token(&nptr);
-                                        if (s_server_cfg_check_digit(ptr, digits)) {
-                                                config->monitor.pixclock = atoi(ptr);
-                                        } else {
-                                                goto tm_bad;
-                                        }
-                                        ptr = s_server_cfg_token(&nptr);
-                                        if (s_server_cfg_check_digit(ptr, digits)) {
-                                                config->monitor.left_margin = atoi(ptr);
-                                        } else {
-                                                goto tm_bad;
-                                        }
-                                        ptr = s_server_cfg_token(&nptr);
-                                        if (s_server_cfg_check_digit(ptr, digits)) {
-                                                config->monitor.right_margin = atoi(ptr);
-                                        } else {
-                                                goto tm_bad;
-                                        }
-                                        ptr = s_server_cfg_token(&nptr);
-                                        if (s_server_cfg_check_digit(ptr, digits)) {
-                                                config->monitor.upper_margin = atoi(ptr);
-                                        } else {
-                                                goto tm_bad;
-                                        }
-                                        ptr = s_server_cfg_token(&nptr);
-                                        if (s_server_cfg_check_digit(ptr, digits)) {
-                                                config->monitor.lower_margin = atoi(ptr);
-                                        } else {
-                                                goto tm_bad;
-                                        }
-                                        ptr = s_server_cfg_token(&nptr);
-                                        if (s_server_cfg_check_digit(ptr, digits)) {
-                                                config->monitor.hsync_len = atoi(ptr);
-                                        } else {
-                                                goto tm_bad;
-                                        }
-                                        ptr = s_server_cfg_token(&nptr);
-                                        if (s_server_cfg_check_digit(ptr, digits)) {
-                                                config->monitor.vsync_len = atoi(ptr);
-                                        } else {
-                                                goto tm_bad;
-                                        }
-                                        ptr = s_server_cfg_token(&nptr);
-                                        if (s_server_cfg_check_digit(ptr, digits)) {
-                                                config->monitor.vmode = atoi(ptr);
-                                        } else {
-tm_bad:                                         debugf(DSER, "Illegal timing setting. Correct usage: vertrefresh pixclock left_margin right_margin upper_margin lower_margin hsync_len vsync_len vmode\n");
-                                                ret = -1;
-                                        }
-                                        s_free(nptr_);
-                                }
-                        }
-                }
-        }
-        s_config_uninit(cfg);
-        {
-                s_video_driver_t **vd;
-                for (vd = video_drivers; *vd; vd++) {
-                        if (strcmp((*vd)->driver, config->general.driver) == 0) {
-                                if ((strlen((*vd)->driver) >= S_FNAME_MAX) ||
-                                    (strlen((*vd)->device) >= S_FNAME_MAX)) {
-                                        debugf(DSER, "driver:%s, or device:%s name is too long (> %d). skipping", (*vd)->driver, (*vd)->device, S_FNAME_MAX);
-                                        continue;
-                                }
-                                server->driver = *vd;
-                        }
-                }
-                if (server->driver == NULL) {
-                        debugf(DSER, "Unknown video driver : %s", config->general.driver);
-                        ret = -1;
-                }
-        }
-
-        return ret;
-}
-
-int s_server_init (void)
-{
-        int i;
-        int mode;
         void *addr;
         s_server_conf_t config;
@@ -291 +221 @@
                 goto err0;
         }
-        
-        BlazeServerConfig(&config);
-
-        server->window->surface->buf->x = 0;
-        server->window->surface->buf->y = 0;
+
+        server->window->surface->buf->x = 0;
+        server->window->surface->buf->y = 0;
         server->window->surface->buf->w = 0;
         server->window->surface->buf->h = 0;
@@ -301 +229 @@
         server->window->surface->linear_buf_pitch = 0;
         server->window->surface->linear_buf_height = 0;
-        
-        if (server->driver->server_init != NULL) {
-                mode = server->driver->server_init(&config);
-                if (mode < 0) {
-                        debugf(DSER, "server->driver->server_init(&config) failed");
-                        goto err0;
-                }
-        } else {
-                debugf(DSER, "server->driver->server_init == NULL");
-                goto err0;
-        }
 
         server->window->surface->bluemask = ((1 << server->window->surface->bluelength) - 1) << server->window->surface->blueoffset;
         server->window->surface->greenmask = ((1 << server->window->surface->greenlength) - 1) << server->window->surface->greenoffset;
         server->window->surface->redmask = ((1 << server->window->surface->redlength) - 1) << server->window->surface->redoffset;
+
+        /* For now. */
+        config.general.rotate = 0;
 
         if (config.general.rotate) {
@@ -367 +287 @@
 
         server->window->surface->mode = SURFACE_REAL;
-        server->mode = mode;
 
     s_event_init(&server->window->event);
@@ -383 +302 @@
 
         s_free(config.general.driver);
-        s_free(config.general.mode);
+//      s_free(config.general.mode);
         s_free(config.mouse.type);
         s_free(config.mouse.device);
         s_free(config.keyboard.keyboard);
+        
+#if 0
         s_free(config.irr.type);
         s_free(config.irr.device);
         s_free(config.irr.brate);
+#endif
 
         server->window->running = 1;
@@ -396 +318 @@
 
 err0:   s_free(config.general.driver);
-        s_free(config.general.mode);
+//      s_free(config.general.mode);
         s_free(config.mouse.type);
         s_free(config.mouse.device);

Whitix/trunk/user/xynth/src/server/server.h

@@ -59 +59 @@
         char *device;
 
-        int (*server_init) (s_server_conf_t *cfg);
+        int (*server_init) (s_server_t* server);
         void (*server_uninit) (void);
+        
+        /* Returns 1 if there is a device the driver can use, 0 otherwise. */
+        int (*probe)(s_server_t* server);
 
         void *driver_data;

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,
 };

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

@@ -161 +161 @@
 }
 
-int s_video_vga_server_init (s_server_conf_t *cfg)
+/* VGA is the lowest common denominator for video output. Every PC supports it. */
+int VgaProbe(s_server_t* server)
+{
+        return 1;
+}
+
+int s_video_vga_server_init (s_server_t* server)
 {
         printf("Loading VGA driver.\n");
@@ -195 +201 @@
         server->window->surface->linear_mem_size=VGA_SIZE;
 
-        if (!noGraphics)
-                VgaInit();
+        VgaInit();
 
         return 0;
 }
 
-s_video_driver_t s_video_vga = {
+s_video_driver_t videoDriver = {
         "vga",
         "/System/Devices/Special/Memory",
         s_video_vga_server_init,
+        VgaProbe,
         s_video_vga_server_uninit,
 };