modualarized 'hardware' api changes complete

[dcpu16] / dcpu16.h

diff --git a/dcpu16.h b/dcpu16.h
index 38203edfc52eee41553f9d28a1f9812d4b4c648f..9ca39124e402cfa8b5030a5e65513f54d1ecb7dc 100644 (file)
--- a/dcpu16.h
+++ b/dcpu16.h
@@ -67,7 +67,8 @@ struct dcpu16_acct_cb {
     dcpu16_acct_event mask;
 };
 
-typedef void (dcpu16_hw_signal_t)(struct dcpu16 *, void *);
+typedef void (dcpu16_hw_signal_t)(struct dcpu16 *, struct dcpu16_hw *);
+typedef void (dcpu16_hw_data_free_t)(struct dcpu16_hw *);
 /* these are used to define hardware attached to the system */
 struct dcpu16_hw {
     struct dcpu16 *vm;  /* which system do I belong to */
@@ -82,9 +83,18 @@ struct dcpu16_hw {
     dcpu16_hw_signal_t *hwi;
     dcpu16_hw_signal_t *cycle;
     dcpu16_hw_signal_t *reset;
+
+    dcpu16_hw_data_free_t *data_free;
     void *data;
 };
 
+typedef int (dcpu16_hw_data_init_t)(struct dcpu16_hw *, void *);
+struct dcpu16_hw_module {
+    struct dcpu16_hw *template;
+    dcpu16_hw_data_init_t *data_init;
+    dcpu16_hw_data_free_t *data_free;
+};
+
 /* instantiate a new core */
 struct dcpu16 *dcpu16_new(void);
 
@@ -103,8 +113,12 @@ DCPU16_WORD dcpu16_mnemonify_buf(DCPU16_WORD *);
 /* print the instruction at the specified address, returns number of words consumed in decoding */
 DCPU16_WORD dcpu16_disassemble_print(struct dcpu16 *, DCPU16_WORD);
 
+/* create and delete 'hardware' objects */
+struct dcpu16_hw *dcpu16_hw_new(struct dcpu16 *, struct dcpu16_hw_module *, void *);
+void dcpu16_hw_del(struct dcpu16_hw **);
+
 /* register new 'hardware' device with system */
-int dcpu16_hw_add(struct dcpu16 *, struct dcpu16_hw *);
+int dcpu16_hw_attach(struct dcpu16 *, struct dcpu16_hw *);
 
 /* register a callback for an accounting event */
 int dcpu16_acct_add(struct dcpu16 *, dcpu16_acct_event, dcpu16_ev_cb_t *, void *);