moved module/hw fields around

[dcpu16] / hw_spc2000.c

diff --git a/hw_spc2000.c b/hw_spc2000.c
index c967822279768111ec770cb7dbb42a3fcd39c325..1e20f59c4ce8803aa9ed6dd706b0e8426e9629b2 100644 (file)
--- a/hw_spc2000.c
+++ b/hw_spc2000.c
@@ -85,9 +85,9 @@ void spc2000_hwi_(struct dcpu16 *vm, struct dcpu16_hw *hw) {
     }
 }
 
-static struct dcpu16_hw hw_ = {
-    .vm     = NULL,
+struct dcpu16_hw_module dcpu16_hw_module_spc2000 = {
     .name_  = "SPC2000 - Suspension Chamber 2000",
+
     .id_l   = 0x1d9d,
     .id_h   = 0x40e4,
     .ver    = 0x005e,
@@ -96,11 +96,7 @@ static struct dcpu16_hw hw_ = {
     .hwi    = spc2000_hwi_,
     .cycle  = spc2000_cycle_,
     .reset  = spc2000_reset_,
-    .data   = (struct spc2000_ *)NULL
-};
 
-struct dcpu16_hw_module dcpu16_hw_module_spc2000 = {
-    .template = &hw_,
     .data_init = spc2000_data_init_,
     .data_free = spc2000_data_free_,
     .ctl = NULL,