--- trunk/src/devices/dev_sgi_ip32.c	2007/10/08 16:19:16	19
+++ trunk/src/devices/dev_sgi_ip32.c	2007/10/08 16:19:23	20
@@ -25,7 +25,7 @@
  *  SUCH DAMAGE.
  *   
  *
- *  $Id: dev_sgi_ip32.c,v 1.34 2005/10/27 14:01:14 debug Exp $
+ *  $Id: dev_sgi_ip32.c,v 1.38 2005/11/21 09:17:27 debug Exp $
  *  
  *  SGI IP32 devices.
  *
@@ -241,7 +241,7 @@
 	d->use_fb = use_fb;
 
 	memory_device_register(mem, "crime", baseaddr, DEV_CRIME_LENGTH,
-	    dev_crime_access, d, MEM_DEFAULT, NULL);
+	    dev_crime_access, d, DM_DEFAULT, NULL);
 	machine_add_tickfunction(machine, dev_crime_tick, d, CRIME_TICKSHIFT);
 
 	return d;
@@ -323,7 +323,7 @@
 	d->irqnr = irqnr;
 
 	memory_device_register(mem, "mace", baseaddr, DEV_MACE_LENGTH,
-	    dev_mace_access, d, MEM_DEFAULT, NULL);
+	    dev_mace_access, d, DM_DEFAULT, NULL);
 
 	return d;
 }
@@ -372,11 +372,10 @@
 	case 0xcfc:	/*  PCI DATA  */
 		if (writeflag == MEM_WRITE) {
 			res = bus_pci_access(cpu, mem, relative_addr,
-			    &idata, writeflag, d->pci_data);
+			    &idata, len, writeflag, d->pci_data);
 		} else {
 			res = bus_pci_access(cpu, mem, relative_addr,
-			    &odata, writeflag, d->pci_data);
-			/*  odata = 0;  */
+			    &odata, len, writeflag, d->pci_data);
 		}
 		break;
 	default:
@@ -410,10 +409,10 @@
 	}
 	memset(d, 0, sizeof(struct macepci_data));
 
-	d->pci_data = bus_pci_init(pciirq);
+	d->pci_data = bus_pci_init(pciirq, 0,0, 0,0,0, 0,0,0);
 
 	memory_device_register(mem, "macepci", baseaddr, DEV_MACEPCI_LENGTH,
-	    dev_macepci_access, (void *)d, MEM_DEFAULT, NULL);
+	    dev_macepci_access, (void *)d, DM_DEFAULT, NULL);
 
 	return d->pci_data;
 }
@@ -957,7 +956,7 @@
 
 	memory_device_register(mem, name2, baseaddr,
 	    DEV_SGI_MEC_LENGTH, dev_sgi_mec_access, (void *)d,
-	    MEM_DEFAULT, NULL);
+	    DM_DEFAULT, NULL);
 
 	machine_add_tickfunction(machine, dev_sgi_mec_tick, d, MEC_TICK_SHIFT);
 
@@ -1028,7 +1027,7 @@
 
 	memory_device_register(mem, "sgi_ust", baseaddr,
 	    DEV_SGI_UST_LENGTH, dev_sgi_ust_access, (void *)d,
-	    MEM_DEFAULT, NULL);
+	    DM_DEFAULT, NULL);
 }
 
 
@@ -1303,6 +1302,6 @@
 	memset(d, 0, sizeof(struct sgi_mte_data));
 
 	memory_device_register(mem, "sgi_mte", baseaddr, DEV_SGI_MTE_LENGTH,
-	    dev_sgi_mte_access, (void *)d, MEM_DEFAULT, NULL);
+	    dev_sgi_mte_access, (void *)d, DM_DEFAULT, NULL);
 }