X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=dcpu16.h;h=f70372a0d11655034ff279e038aeb0930c54b9d4;hb=d3c579a9b588b7f94fca88474ab2bd010f67a22f;hp=9ca39124e402cfa8b5030a5e65513f54d1ecb7dc;hpb=8b552fe61db48874f043bccfb589e5444509444c;p=dcpu16

diff --git a/dcpu16.h b/dcpu16.h
index 9ca3912..f70372a 100644
--- a/dcpu16.h
+++ b/dcpu16.h
@@ -68,10 +68,10 @@ struct dcpu16_acct_cb {
 };
 
 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 */
+    struct dcpu16_hw_module *mod;   /* whence I came */
     char *name_;
 
     DCPU16_WORD id_l;
@@ -84,15 +84,25 @@ struct dcpu16_hw {
     dcpu16_hw_signal_t *cycle;
     dcpu16_hw_signal_t *reset;
 
-    dcpu16_hw_data_free_t *data_free;
     void *data;
 };
 
+/* human-readable text describing hw module control operations, for convenience's sake */
+struct dcpu16_hw_ctl_cmd {
+    char *command;
+    char *data_in_type;
+    char *data_out_type;
+    char *description;
+};
 typedef int (dcpu16_hw_data_init_t)(struct dcpu16_hw *, void *);
+typedef void (dcpu16_hw_data_free_t)(struct dcpu16_hw *);
+typedef int (dcpu16_hw_ctl_t)(struct dcpu16_hw *, const char *, void *, void *);
 struct dcpu16_hw_module {
     struct dcpu16_hw *template;
     dcpu16_hw_data_init_t *data_init;
     dcpu16_hw_data_free_t *data_free;
+    dcpu16_hw_ctl_t *ctl;
+    struct dcpu16_hw_ctl_cmd *ctl_cmd;
 };
 
 /* instantiate a new core */
@@ -117,6 +127,9 @@ DCPU16_WORD dcpu16_disassemble_print(struct dcpu16 *, DCPU16_WORD);
 struct dcpu16_hw *dcpu16_hw_new(struct dcpu16 *, struct dcpu16_hw_module *, void *);
 void dcpu16_hw_del(struct dcpu16_hw **);
 
+/* set options on hardware objects */
+int dcpu16_hw_ctl(struct dcpu16_hw *, const char *, void *, void *);
+
 /* register new 'hardware' device with system */
 int dcpu16_hw_attach(struct dcpu16 *, struct dcpu16_hw *);