--- trunk/src/machines/machine_prep.c	2007/10/08 16:21:17	34
+++ trunk/src/machines/machine_prep.c	2007/10/08 16:22:32	42
@@ -25,9 +25,9 @@
  *  SUCH DAMAGE.
  *   
  *
- *  $Id: machine_prep.c,v 1.17 2007/01/21 21:02:57 debug Exp $
+ *  $Id: machine_prep.c,v 1.20 2007/06/15 18:08:10 debug Exp $
  *
- *  Machines conforming to the PowerPC Reference Platform specs.
+ *  COMMENT: Machines conforming to the PowerPC Reference Platform specs
  */
 
 #include <stdio.h>
@@ -57,7 +57,6 @@
 	case MACHINE_PREP_IBM6050:
 		machine->machine_name =
 		    "PowerPC Reference Platform, IBM 6050/6070";
-		machine->stable = 1;
 		model_name = "IBM PPS Model 6050/6070 (E)";
 
 		if (machine->emulated_hz == 0)
@@ -74,7 +73,7 @@
 		bus_pci_add(machine, pci_data, machine->memory,
 		    0, 13, 0, "dec21143");
 
-		if (machine->use_x11) {
+		if (machine->x11_md.in_use) {
 			bus_pci_add(machine, pci_data, machine->memory,
 			    0, 14, 0, "s3_virge");
 		}
@@ -133,7 +132,8 @@
 	/*  type: console  */
 	store_32bit_word(cpu, cpu->cd.ppc.gpr[6]+12, 20);
 	store_32bit_word(cpu, cpu->cd.ppc.gpr[6]+16, 1);
-	store_buf(cpu, cpu->cd.ppc.gpr[6]+20, machine->use_x11? "vga":"com", 4);
+	store_buf(cpu, cpu->cd.ppc.gpr[6]+20,
+	    machine->x11_md.in_use? "vga":"com", 4);
 	store_32bit_word(cpu, cpu->cd.ppc.gpr[6]+24, 0x3f8);/*  addr  */
 	store_32bit_word(cpu, cpu->cd.ppc.gpr[6]+28, 9600);/*  speed  */