--- trunk/src/machines/machine_sandpoint.c	2007/10/13 15:05:59	63
+++ trunk/src/machines/machine_sandpoint.c	2007/10/14 18:34:52	72
@@ -47,7 +47,7 @@
 MACHINE_SETUP(sandpoint)
 {
 	struct pci_data *pci_data;
-//	char tmpstr[300];
+	char tmp[300];
 
 	/*
 	 *  NetBSD/sandpoint (http://www.netbsd.org/ports/sandpoint/)
@@ -64,26 +64,25 @@
 	// OpenPIC FIXME
 	device_add(machine, "openpic addr=0xfc041000");
 
-#if 0
-	snprintf(tmpstr, sizeof(tmpstr), "prep irq=%s.cpu[%i]",
-	    machine->path, machine->bootstrap_cpu);
-	device_add(machine, tmpstr);
-#endif
 
 	/*  PCI and Interrupt controller (hostbus)  */
 	pci_data = dev_mpc10x_init(machine, machine->memory, 0xfe000000,
 	    64 /*  isa irq base */, 128 /*  pci irq: TODO */);
 
-	/*  serial port  */
 
+	/*  serial ports  */
+
+	snprintf(tmp, sizeof(tmp), "ns16550 irq=%s.cpu[%i].openpic.%i addr=0x%llx "
+	    "name2=tty1", machine->path, machine->bootstrap_cpu, 121, (long long)0xfc004500);
 	machine->main_console_handle = (size_t)
-		device_add(machine, "ns16550 addr=0xfc004500");
+		device_add(machine, tmp);
+
 #if 0
-	snprintf(tmp, sizeof(tmp), "ns16550 irq=%s.mpc10x.%i addr=0x%llx "
-	    "name2=tty1", devinit->interrupt_path, 31 - MPC_IB_UART_1,
-	    (long long)fc004600);
-	device_add(devinit->machine, tmp);
+	snprintf(tmp, sizeof(tmp), "ns16550 irq=%s.cpu[%i].openpic.%i addr=0x%llx "
+	    "name2=tty1", machine->path, machine->bootstrap_cpu, 122, (long long)0xfc004600);
+	device_add(machine, tmp);
 #endif
+
 #if 0
 	/*  RTC at "ext int 5" = "int 25" in IBM jargon, int
 	    31-25 = 6 for the rest of us.  */