X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=hw_lem1802.c;h=0b95d1180530d885e533a05b48a8d960d5d8ac0d;hb=49be905f037fbd22b6ae0275efbab2ed95d4d9b7;hp=06b0d5ac2c5d9392fb58d0b76c19995fb38d67f8;hpb=94be117719b907e351bb2bf1096f6195daecd2aa;p=dcpu16

diff --git a/hw_lem1802.c b/hw_lem1802.c
index 06b0d5a..0b95d11 100644
--- a/hw_lem1802.c
+++ b/hw_lem1802.c
@@ -319,7 +319,8 @@ f_done:
 
 #ifdef HAVE_LIBVNCSERVER
 /* create and return a new screen, easiest to do here because we know the screen dimensions */
-rfbScreenInfoPtr lem1802_rfb_new(int argc, char *argv[]) {
+static
+rfbScreenInfoPtr lem1802_rfb_new_(int argc, char *argv[]) {
     rfbScreenInfoPtr s;
     int paddedWidth = PIX_X + ( (PIX_X & 3) ? (4 - (PIX_X & 3)) : 0 );
     int height = PIX_Y;
@@ -509,8 +510,8 @@ static struct renderer_ {
     { NULL, NULL, NULL }
 };
 
-
-char *lem1802_renderers_iter(void **iterp, char **name, char **args) {
+static
+char *lem1802_renderers_iter_(void **iterp, char **name, char **args) {
     struct renderer_ **r = (struct renderer_ **)iterp;
 
     if (*r == NULL)
@@ -529,6 +530,7 @@ char *lem1802_renderers_iter(void **iterp, char **name, char **args) {
     return (*r)->name;
 }
 
+static
 int lem1802_data_init_(struct dcpu16_hw *hw, void *data) {
     (void)data;
 
@@ -552,6 +554,7 @@ int lem1802_data_init_(struct dcpu16_hw *hw, void *data) {
     return 0;
 }
 
+static
 void lem1802_data_free_(struct dcpu16_hw *hw) {
     if (hw) {
         if (hw->data) {
@@ -566,15 +569,19 @@ void lem1802_data_free_(struct dcpu16_hw *hw) {
 }
 
 static struct dcpu16_hw_ctl_cmd ctl_[] = {
-    { "blink_rate", "const unsigned int *rate", "unsigned int *rate", "sets or gets cycles per blink toggle" },
-    { "refresh_rate", "const unsigned int *rate", "unsigned int *rate", "sets or gets cycles per screen refresh" },
+    { "blink_rate", "const unsigned int *", "unsigned int *", "sets or gets cycles per blink toggle" },
+    { "refresh_rate", "const unsigned int *", "unsigned int *", "sets or gets cycles per screen refresh" },
 #ifdef HAVE_LIBVNCSERVER
+    { "new_rfbScreen", "struct { int argc; char **argv;} *", "rfbScreenInfoPtr *", "allocates a new rfb screen" },
     { "associate_rfbScreen", "rfbScreenInfoPtr", "NULL", "associates this lem1802 instance with an rfb display" },
 #endif /* HAVE_LIBVNCSERVER */
+    { "renderers_iter", "void **", "struct {char *name; char *args;} *", "returns the next renderer this module is capable of using" },
     { "renderer", "const char *", "NULL", "sets this lem1802 instance to use renderer" },
     { "renderer_data", "void *", "NULL", "sets renderer-specific data" },
     { NULL, NULL, NULL, NULL }
 };
+
+static
 int lem1802_data_ctl_(struct dcpu16_hw *hw, const char *cmd, void *data_in, void *data_out) {
     if (strcmp(cmd, "blink_rate") == 0) {
         struct lem1802_ *display = (struct lem1802_ *)hw->data;
@@ -609,10 +616,22 @@ int lem1802_data_ctl_(struct dcpu16_hw *hw, const char *cmd, void *data_in, void
     }
 
 #ifdef HAVE_LIBVNCSERVER
+    if (strcmp(cmd, "new_rfbScreen") == 0) {
+        struct args_ { int argc; char **argv;} *in = (struct args_ *)data_in;
+        rfbScreenInfoPtr *s_out = (rfbScreenInfoPtr *)data_out;
+
+        if (in == NULL || s_out == NULL)
+            return -EFAULT;
+
+        *s_out = lem1802_rfb_new_(in->argc, in->argv);
+
+        return 0;
+    }
+
     if (strcmp(cmd, "associate_rfbScreen") == 0) {
         struct lem1802_ *display = (struct lem1802_ *)hw->data;
-        rfbScreenInfoPtr rfbScreen = (rfbScreenInfoPtr)data_out;
-        (void)data_in;
+        rfbScreenInfoPtr rfbScreen = (rfbScreenInfoPtr)data_in;
+        (void)data_out;
 
         if (rfbScreen == NULL)
             return -EFAULT;
@@ -624,6 +643,21 @@ int lem1802_data_ctl_(struct dcpu16_hw *hw, const char *cmd, void *data_in, void
     }
 #endif /* HAVE_LIBVNCSERVER */
 
+    if (strcmp(cmd, "renderers_iter") == 0) {
+        void **iterp = (void **)data_in;
+        struct packed_out_ {
+            char *name;
+            char *args;
+        } *parg = (struct packed_out_ *)data_out;
+
+        if (iterp == NULL || parg == NULL)
+            return -EFAULT;
+
+        (void)lem1802_renderers_iter_(iterp, &parg->name, &parg->args);
+
+        return 0;
+    }
+
     if (strcmp(cmd, "renderer") == 0) {
         struct lem1802_ *display = (struct lem1802_ *)hw->data;
         char *renderer = (char *)data_in;
@@ -656,8 +690,9 @@ int lem1802_data_ctl_(struct dcpu16_hw *hw, const char *cmd, void *data_in, void
 }
 
 
-static struct dcpu16_hw hw_ = {
+struct dcpu16_hw_module dcpu16_hw_module_lem1802 = {
     .name_  = "LEM1802 - Low Energy Monitor",
+
     .id_l   = 0xf615,
     .id_h   = 0x7349,
     .ver    = 0x1802,
@@ -666,11 +701,7 @@ static struct dcpu16_hw hw_ = {
     .hwi    = lem1802_hwi_,
     .cycle  = lem1802_cycle_,
     .reset  = lem1802_reset_,
-    .data   = (struct lem1802_ *)NULL
-};
 
-struct dcpu16_hw_module dcpu16_hw_module_lem1802 = {
-    .template = &hw_,
     .data_init = lem1802_data_init_,
     .data_free = lem1802_data_free_,
     .ctl = lem1802_data_ctl_,