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_common.c

@@ -11,30 +11,25 @@
 #include "../floppy/floppy.h"
 #include "../floppy/fdd.h"
 #include "../floppy/fdc.h"
-#include "machine_common.h"
+#include "machine.h"
 
 
-void machine_common_init(void)
+void
+machine_common_init(machine_t *model)
 {
-	/* System devices first. */
-        dma_init();
-        pic_init();
-        pit_init();
+    /* System devices first. */
+    dma_init();
+    pic_init();
+    pit_init();
 
-	if (lpt_enabled)
-	{
-		lpt_init();
-	}
+    if (lpt_enabled)
+	lpt_init();
 
-	if (serial_enabled[0])
-	{
-		serial_setup(1, SERIAL1_ADDR, SERIAL1_IRQ);
-	}
+    if (serial_enabled[0])
+	serial_setup(1, SERIAL1_ADDR, SERIAL1_IRQ);
 
-	if (serial_enabled[1])
-	{
-		serial_setup(2, SERIAL2_ADDR, SERIAL2_IRQ);
-	}
+    if (serial_enabled[1])
+	serial_setup(2, SERIAL2_ADDR, SERIAL2_IRQ);
 
-        fdc_add();
+    fdc_add();
 }