More general changes and cleanups, mostly in machine/ now. Also updated SCSI and Network device drivers to use new device init method.

src/machine/machine_at.c

@@ -15,50 +15,57 @@
 #include "../lpt.h"
 #include "../disk/hdc.h"
 #include "../disk/hdc_ide.h"
-#include "machine_common.h"
-#include "machine_at.h"
+#include "machine.h"
 
 
-void machine_at_init(void)
+void
+machine_at_init(machine_t *model)
 {
-	AT = 1;
+    AT = 1;
 
-        machine_common_init();
-        pit_set_out_func(&pit, 1, pit_refresh_timer_at);
-        pic2_init();
-        dma16_init();
+    machine_common_init(model);
 
-	if (lpt_enabled)
-		lpt2_remove();
+    pit_set_out_func(&pit, 1, pit_refresh_timer_at);
+    pic2_init();
+    dma16_init();
 
-        nvr_at_init(8);
+    if (lpt_enabled)
+	lpt2_remove();
 
-        keyboard_at_init();
+    nvr_at_init(8);
 
-	if (joystick_type != 7)
-		device_add(&gameport_device);
+    keyboard_at_init();
 
-	if (bugger_enabled)
-		bugger_init();
+    if (joystick_type != 7)
+	device_add(&gameport_device);
+
+    if (bugger_enabled)
+	bugger_init();
 }
 
-void machine_at_ide_init(void)
-{
-	machine_at_init();
 
-	ide_init();
+void
+machine_at_ide_init(machine_t *model)
+{
+    machine_at_init(model);
+
+    ide_init();
 }
 
-void machine_at_top_remap_init(void)
-{
-	machine_at_init();
 
-	mem_remap_top_384k();
+void
+machine_at_top_remap_init(machine_t *model)
+{
+    machine_at_init(model);
+
+    mem_remap_top_384k();
 }
 
-void machine_at_ide_top_remap_init(void)
-{
-	machine_at_ide_init();
 
-	mem_remap_top_384k();
+void
+machine_at_ide_top_remap_init(machine_t *model)
+{
+    machine_at_ide_init(model);
+
+    mem_remap_top_384k();
 }