--- trunk/src/machines/machine_macppc.c	2007/10/08 16:21:17	34
+++ trunk/src/machines/machine_macppc.c	2007/10/08 16:22:32	42
@@ -25,11 +25,13 @@
  *  SUCH DAMAGE.
  *   
  *
- *  $Id: machine_macppc.c,v 1.11 2007/02/18 09:19:47 debug Exp $
+ *  $Id: machine_macppc.c,v 1.16 2007/06/15 18:08:10 debug Exp $
+ *
+ *  COMMENT: Generic PowerPC-based Macintosh machines
  *
  *  See also:
  *
- *	NetBSD/macppc (http://www.netbsd.org/Ports/macppc/)
+ *	NetBSD/macppc (http://www.netbsd.org/ports/macppc/)
  *	OpenBSD/macppc (http://www.openbsd.org/macppc.html)
  *
  *  Currently, these are skeletons for generic PowerMac G3, G4, and G5 systems.
@@ -41,6 +43,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "bus_pci.h"
 #include "cpu.h"
 #include "device.h"
 #include "devices.h"
@@ -62,12 +65,6 @@
 	if (machine->emulated_hz == 0)
 		machine->emulated_hz = 40000000;
 
-	/*  NetBSD/macppc works on the "G4" machine type:  */
-	switch (machine->machine_subtype) {
-	case MACHINE_MACPPC_G4:
-		machine->stable = 1;
-	}
-
 	device_add(machine, "gc addr=0xf3000000");
 
 	pci_data = dev_uninorth_init(machine, machine->memory, 0xe2000000,
@@ -77,7 +74,7 @@
 	    machine, pci_data, machine->memory, 0, 12, 0, "dec21143");  */
 	bus_pci_add(machine, pci_data, machine->memory, 0, 15, 0, "gc_obio");
 
-	if (machine->use_x11)
+	if (machine->x11_md.in_use)
 		bus_pci_add(machine, pci_data, machine->memory, 0, 16, 0,
 		    "ati_radeon_9200_2");
 
@@ -104,7 +101,7 @@
 	of_emul_init(machine, fb, 0xf1000000, 1024, 768);
 	of_emul_init_uninorth(machine);
 
-	if (machine->use_x11)
+	if (machine->x11_md.in_use)
 		of_emul_init_adb(machine);
 	else
 		of_emul_init_zs(machine);