added verbosity command to shell

[dcpu16] / hw_lem1802.c

diff --git a/hw_lem1802.c b/hw_lem1802.c
index 06b0d5ac2c5d9392fb58d0b76c19995fb38d67f8..1ae7b57d049452da312165b70444d0fd41ba5ec8 100644 (file)
--- a/hw_lem1802.c
+++ b/hw_lem1802.c
@@ -38,7 +38,7 @@
 #define VOIDFP(__x__) (__x__)
 #endif
 
-#define LEM1802_POWER_ON_CYCLES 100000 /* this should vary by, let us say, 10% */
+#define LEM1802_POWER_ON_CYCLES 100000 /* 'about one second' */
 
 #define PIX_X 160       /* pixels in display */
 #define PIX_Y 128       /* pixels in display */
@@ -72,7 +72,7 @@ struct pixel_ {
     unsigned char r;
     unsigned char g;
     unsigned char b;
-    unsigned char a;
+    unsigned char a; /* unused */
 };
 
 struct lem1802_ {
@@ -111,6 +111,7 @@ long long power_on_cycles_(void) {
 
 #if WANT_DELAY_START
     gettimeofday(&tv, NULL);
+    /* consider the 'about' in 'about one second' to be +/- 10% */
     r += LEM1802_POWER_ON_CYCLES - (LEM1802_POWER_ON_CYCLES / 10);
     r += tv.tv_usec % (LEM1802_POWER_ON_CYCLES / 5);
 #endif
@@ -139,7 +140,7 @@ static
 void pixbuf_border_paint_(struct pixel_ *pixbuf, struct pixel_ *border) {
     size_t x, y, i;
 
-    TRACE("%s>> painted border", __func__);
+    TRACE("%s>> painting border", __func__);
 
     /* top */
     for (y = 0; y < PIX_BORDER; y++) {
@@ -319,7 +320,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;
@@ -352,6 +354,8 @@ int pixbuf_render_vnc_(void *data, struct pixel_ *pixbuf, size_t x, size_t y) {
 
     (void)pixbuf;
 
+    TRACE("%s>> s:%p", __func__, s);
+
     /* derp */
     if (s)
         rfbMarkRectAsModified(s, 0, 0, x, y);
@@ -384,7 +388,7 @@ void lem1802_reset_(struct dcpu16 *vm, struct dcpu16_hw *hw) {
     display->cycle_state_ = 0;
 
 #if DEBUG
-    vm->trace_cb_("%s>>", __func__);
+    vm->msg_cb_(MSG_DEBUG, "%s>>", __func__);
 #endif /* DEBUG */
 }
 
@@ -509,8 +513,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,18 +533,19 @@ 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;
 
     hw->data = calloc(1, sizeof(struct lem1802_));
     if (hw->data == NULL) {
-        hw->vm->warn_cb_("%s():%s", "calloc", strerror(errno));
+        hw->vm->msg_cb_(MSG_ERROR, "%s():%s", "calloc", strerror(errno));
         return -1;
     }
 
     ((struct lem1802_ *)(hw->data))->pixbuf = calloc(PIX_X * PIX_Y, sizeof *((struct lem1802_ *)(hw->data))->pixbuf);
     if (((struct lem1802_ *)(hw->data))->pixbuf == NULL) {
-        hw->vm->warn_cb_("%s():%s", "calloc", strerror(errno));
+        hw->vm->msg_cb_(MSG_ERROR, "%s():%s", "calloc", strerror(errno));
         free(hw->data);
         hw->data = NULL;
         return -1;
@@ -552,6 +557,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 +572,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 +619,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 +646,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;
@@ -638,7 +675,7 @@ int lem1802_data_ctl_(struct dcpu16_hw *hw, const char *cmd, void *data_in, void
             }
         }
 
-        hw->vm->warn_cb_("unknown renderer '%s'", renderer);
+        hw->vm->msg_cb_(MSG_ERROR, "unknown renderer '%s'", renderer);
 
         return -ENOENT;
     }
@@ -656,8 +693,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 +704,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_,