modualarized 'hardware' api changes complete

[dcpu16] / hw_keyboard.c

diff --git a/hw_keyboard.c b/hw_keyboard.c
index d5c90b3faf4b2af6f5a1519894c02107d8b7ea8d..428971d5a6a6ecfcb51c0e19e88d3ed024c23ab6 100644 (file)
--- a/hw_keyboard.c
+++ b/hw_keyboard.c
@@ -12,22 +12,11 @@
 
 #define BUF_SZ 32
 
-static dcpu16_hw_signal_t keyboard_reset_;
-static dcpu16_hw_signal_t keyboard_cycle_;
-static dcpu16_hw_signal_t keyboard_hwi_;
-static struct dcpu16_hw hw_ = {
-    .vm     = NULL,
-    .name_  = "Generic Keyboard (compatible)",
-    .id_l   = 0x7406,
-    .id_h   = 0x30cf,
-    .ver    = 0x0001,
-    .mfg_l  = 0x0000,
-    .mfg_h  = 0x0000,
-    .hwi    = keyboard_hwi_,
-    .cycle  = keyboard_cycle_,
-    .reset  = keyboard_reset_,
-    .data   = (struct keyboard_ *)NULL
-};
+#ifdef WANT_VARIADIC_VOIDP_CAST
+#define VOIDP(__x__) ((void *)(__x__))
+#else
+#define VOIDP(__x__) (__x__)
+#endif
 
 struct keyboard_ {
     char *buf;
@@ -83,10 +72,17 @@ void keyboard_rfbevent_(rfbBool down, rfbKeySym key, rfbClientPtr cl) {
 
     keysym_rfbtodcpu(key, &dcpu_key);
 
-    fprintf(stderr, "%s: down:%u key:0x%04x dcpu_key:0x%04x\n", __func__,
-            down, key, dcpu_key);
+    fprintf(stderr, "%s: down:%u key:0x%04x dcpu_key:0x%04x\n",
+            __func__,
+            down,
+            key,
+            dcpu_key);
 
-    fprintf(stderr, "%s: hw:%p name:%s vm:%p\n", __func__, hw, hw->name_, hw->vm);
+    fprintf(stderr, "%s: hw:%p name:%s vm:%p\n",
+            __func__,
+            VOIDP(hw),
+            hw->name_,
+            VOIDP(hw->vm));
 
     keyboard->keys_pressed[dcpu_key] = (down ? 1 : 0);
     if (down) {
@@ -110,8 +106,8 @@ void keyboard_vnc_associate(struct dcpu16_hw *hw, rfbScreenInfoPtr rfbScreen) {
 #endif /* HAVE_LIBVNCSERVER */
 
 static
-void keyboard_reset_(struct dcpu16 *vm, void *data) {
-    struct keyboard_ *keyboard = (struct keyboard_ *)data;
+void keyboard_reset_(struct dcpu16 *vm, struct dcpu16_hw *hw) {
+    struct keyboard_ *keyboard = (struct keyboard_ *)hw->data;
 
     (void)vm;
 
@@ -120,15 +116,15 @@ void keyboard_reset_(struct dcpu16 *vm, void *data) {
 }
 
 static
-void keyboard_cycle_(struct dcpu16 *vm, void *data) {
-    struct keyboard_ *keyboard = (struct keyboard_ *)data;
+void keyboard_cycle_(struct dcpu16 *vm, struct dcpu16_hw *hw) {
+    struct keyboard_ *keyboard = (struct keyboard_ *)hw->data;
 
     (void)vm, (void)keyboard;
 }
 
 static
-void keyboard_hwi_(struct dcpu16 *vm, void *data) {
-    struct keyboard_ *keyboard = (struct keyboard_ *)data;
+void keyboard_hwi_(struct dcpu16 *vm, struct dcpu16_hw *hw) {
+    struct keyboard_ *keyboard = (struct keyboard_ *)hw->data;
     DCPU16_WORD reg_a = vm->reg[DCPU16_REG_A];
     DCPU16_WORD reg_b = vm->reg[DCPU16_REG_B];
 
@@ -158,47 +154,59 @@ void keyboard_hwi_(struct dcpu16 *vm, void *data) {
     }
 }
 
-struct dcpu16_hw *keyboard_new(struct dcpu16 *vm) {
-    struct dcpu16_hw *hw;
-    char *b;
+static
+int keyboard_data_init_(struct dcpu16_hw *hw, void *data) {
+    size_t buf_sz = data ? *(size_t *)data : BUF_SZ;
 
-    hw = calloc(1, sizeof *hw);
-    if (hw == NULL) {
-        vm->warn_cb_("%s():%s", "calloc", strerror(errno));
-        return NULL;
-    }
-    memcpy(hw, &hw_, sizeof *hw);
-    hw->data = calloc(1, sizeof hw->data);
+    hw->data = calloc(1, sizeof(struct keyboard_));
     if (hw->data == NULL) {
-        vm->warn_cb_("%s():%s", "calloc", strerror(errno));
-        free(hw);
-        return NULL;
+        hw->vm->warn_cb_("%s():%s", "calloc", strerror(errno));
+        return -1;
     }
 
-    b = calloc(BUF_SZ, sizeof *b);
-    if (b == NULL) {
-        vm->warn_cb_("%s():%s", "calloc", strerror(errno));
+    ((struct keyboard_ *)(hw->data))->buf = malloc(buf_sz * sizeof *((struct keyboard_ *)(hw->data))->buf);
+    if (((struct keyboard_ *)(hw->data))->buf == NULL) {
+        hw->vm->warn_cb_("%s():%s", "malloc", strerror(errno));
         free(hw->data);
-        free(hw);
-        return NULL;
+        hw->data = NULL;
+        return -1;
     }
-    ((struct keyboard_ *)(hw->data))->buf = b;
-    ((struct keyboard_ *)(hw->data))->buf_sz = BUF_SZ;
 
-    hw->vm = vm;
+    ((struct keyboard_ *)(hw->data))->buf_sz = buf_sz;
 
-    return hw;
+    return 0;
 }
 
-void keyboard_del(struct dcpu16_hw **hw) {
+static
+void keyboard_data_free_(struct dcpu16_hw *hw) {
     if (hw) {
-        free(((struct keyboard_ *)((*hw)->data))->buf);
-        ((struct keyboard_ *)((*hw)->data))->buf = NULL;
-
-        free((*hw)->data);
-        (*hw)->data = NULL;
-
-        free(*hw);
-        *hw = NULL;
+        if (hw->data) {
+            if (((struct keyboard_ *)(hw->data))->buf) {
+                free(((struct keyboard_ *)(hw->data))->buf);
+                ((struct keyboard_ *)(hw->data))->buf = NULL;
+            }
+            free(hw->data);
+            hw->data = NULL;
+        }
     }
 }
+
+static struct dcpu16_hw hw_ = {
+    .vm     = NULL,
+    .name_  = "Generic Keyboard (compatible)",
+    .id_l   = 0x7406,
+    .id_h   = 0x30cf,
+    .ver    = 0x0001,
+    .mfg_l  = 0x0000,
+    .mfg_h  = 0x0000,
+    .hwi    = keyboard_hwi_,
+    .cycle  = keyboard_cycle_,
+    .reset  = keyboard_reset_,
+    .data   = (struct keyboard_ *)NULL
+};
+
+struct dcpu16_hw_module dcpu16_hw_module_keyboard = {
+    .template = &hw_,
+    .data_init = keyboard_data_init_,
+    .data_free = keyboard_data_free_,
+};