X-Git-Url: http://git.squeep.com/?p=dcpu16;a=blobdiff_plain;f=hw_clock.c;h=252c08f28096d78832a99736a2bc70e57d94b129;hp=89d5912e0092132739f6d74a2fe3686a440f1f70;hb=HEAD;hpb=0a1b4588f79e3719af9431a98da44350030df754

diff --git a/hw_clock.c b/hw_clock.c
index 89d5912..252c08f 100644
--- a/hw_clock.c
+++ b/hw_clock.c
@@ -5,21 +5,14 @@
 #include "dcpu16.h"
 #include "hw_clock.h"
 
-static dcpu16_hw_signal_t clock_reset_;
-static dcpu16_hw_signal_t clock_cycle_;
-static dcpu16_hw_signal_t clock_hwi_;
-static struct dcpu16_hw hw_ = {
-    .name_  = "Generic Clock (compatible)",
-    .id_l   = 0xb402,
-    .id_h   = 0x12d0,
-    .ver    = 0x0001,
-    .mfg_l  = 0x0000,
-    .mfg_h  = 0x0000,
-    .hwi    = clock_hwi_,
-    .cycle  = clock_cycle_,
-    .reset  = clock_reset_,
-    .data   = (struct clock_ *)NULL
-};
+#define MSG_(__level__, __vm__, ...) do { ((__vm__) ? ((struct dcpu16 *)(__vm__))->msg_cb_ : dcpu16_msg_)(__level__, __VA_ARGS__); } while (0)
+#define MSG_INFO(__vm__, ...) MSG_(DCPU16_MSG_INFO, __vm__, __VA_ARGS__)
+#define MSG_ERROR(__vm__, ...) MSG_(DCPU16_MSG_ERROR, __vm__, __VA_ARGS__)
+#ifdef DEBUG
+#define MSG_DEBUG(__vm__, ...) MSG_(DCPU16_MSG_DEBUG, __vm__, __VA_ARGS__)
+#else /* DEBUG  */
+#define MSG_DEBUG(__vm__, ...) do { } while (0)
+#endif /* DEBUG */
 
 struct clock_ {
     DCPU16_WORD cycle_;
@@ -29,8 +22,8 @@ struct clock_ {
 };
 
 static
-void clock_reset_(struct dcpu16 *vm, void *data) {
-    struct clock_ *clock = (struct clock_ *)data;
+void clock_reset_(struct dcpu16 *vm, struct dcpu16_hw *hw) {
+    struct clock_ *clock = (struct clock_ *)hw->data;
 
     (void)vm;
 
@@ -38,8 +31,8 @@ void clock_reset_(struct dcpu16 *vm, void *data) {
 }
 
 static
-void clock_cycle_(struct dcpu16 *vm, void *data) {
-    struct clock_ *clock = (struct clock_ *)data;
+void clock_cycle_(struct dcpu16 *vm, struct dcpu16_hw *hw) {
+    struct clock_ *clock = (struct clock_ *)hw->data;
 
     /* cycle is only called 100000 times per second */
     /* maximum rate is 60hz / word_max = 3932160 */
@@ -55,14 +48,14 @@ void clock_cycle_(struct dcpu16 *vm, void *data) {
 
         if (clock->interrupt_message) {
             if (dcpu16_interrupt(vm, clock->interrupt_message))
-                vm->warn_cb_("%s: could not send interrupt", hw_.name_);
+                MSG_ERROR(vm, "%s: could not send interrupt", hw->mod->name_);
         }
     }
 }
 
 static
-void clock_hwi_(struct dcpu16 *vm, void *data) {
-    struct clock_ *clock = (struct clock_ *)data;
+void clock_hwi_(struct dcpu16 *vm, struct dcpu16_hw *hw) {
+    struct clock_ *clock = (struct clock_ *)hw->data;
     DCPU16_WORD reg_a = vm->reg[DCPU16_REG_A];
     DCPU16_WORD reg_b = vm->reg[DCPU16_REG_B];
 
@@ -81,32 +74,43 @@ void clock_hwi_(struct dcpu16 *vm, void *data) {
     }
 }
 
-/* instantitate a new clock */
-struct dcpu16_hw *clock_new(struct dcpu16 *vm) {
-    struct dcpu16_hw *hw;
+static
+int clock_data_init_(struct dcpu16_hw *hw, void *data) {
+    (void)data;
 
-    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 clock_));
     if (hw->data == NULL) {
-        vm->warn_cb_("%s():%s", "calloc", strerror(errno));
-        free(hw);
-        return NULL;
+        MSG_ERROR(hw->vm, "%s():%s", "calloc", strerror(errno));
+        return -1;
     }
-
-    return hw;
+    return 0;
 }
 
-void clock_del(struct dcpu16_hw **hw) {
+static
+void clock_data_free_(struct dcpu16_hw *hw) {
     if (hw) {
-        free((*hw)->data);
-        (*hw)->data = NULL;
-
-        free((*hw));
-        *hw = NULL;
+        if (hw->data) {
+            free(hw->data);
+            hw->data = NULL;
+        }
     }
 }
+
+
+struct dcpu16_hw_module dcpu16_hw_module_clock = {
+    .name_  = "Generic Clock (compatible)",
+
+    .id_l   = 0xb402,
+    .id_h   = 0x12d0,
+    .ver    = 0x0001,
+    .mfg_l  = 0x0000,
+    .mfg_h  = 0x0000,
+    .hwi    = clock_hwi_,
+    .cycle  = clock_cycle_,
+    .reset  = clock_reset_,
+
+    .data_init = clock_data_init_,
+    .data_free = clock_data_free_,
+    .ctl = NULL,
+    .ctl_cmd = NULL,
+};