--- trunk/src/devices/dev_sgi_ip30.c	2007/10/08 16:19:11	18
+++ trunk/src/devices/dev_sgi_ip30.c	2007/10/08 16:19:37	22
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2004-2005  Anders Gavare.  All rights reserved.
+ *  Copyright (C) 2004-2006  Anders Gavare.  All rights reserved.
  *
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions are met:
@@ -25,7 +25,7 @@
  *  SUCH DAMAGE.
  *   
  *
- *  $Id: dev_sgi_ip30.c,v 1.18 2005/10/26 14:37:04 debug Exp $
+ *  $Id: dev_sgi_ip30.c,v 1.20 2006/01/01 13:17:17 debug Exp $
  *  
  *  SGI IP30 stuff.
  *
@@ -60,9 +60,7 @@
 /*
  *  dev_sgi_ip30_access():
  */
-int dev_sgi_ip30_access(struct cpu *cpu, struct memory *mem,
-	uint64_t relative_addr, unsigned char *data, size_t len,
-	int writeflag, void *extra)
+DEVICE_ACCESS(sgi_ip30)
 {
 	struct sgi_ip30_data *d = (struct sgi_ip30_data *) extra;
 	uint64_t idata = 0, odata = 0;
@@ -153,9 +151,7 @@
 /*
  *  dev_sgi_ip30_2_access():
  */
-int dev_sgi_ip30_2_access(struct cpu *cpu, struct memory *mem,
-	uint64_t relative_addr, unsigned char *data, size_t len,
-	int writeflag, void *extra)
+DEVICE_ACCESS(sgi_ip30_2)
 {
 	struct sgi_ip30_data *d = (struct sgi_ip30_data *) extra;
 	uint64_t idata = 0, odata = 0;
@@ -208,9 +204,7 @@
 /*
  *  dev_sgi_ip30_3_access():
  */
-int dev_sgi_ip30_3_access(struct cpu *cpu, struct memory *mem,
-	uint64_t relative_addr, unsigned char *data, size_t len,
-	int writeflag, void *extra)
+DEVICE_ACCESS(sgi_ip30_3)
 {
 	struct sgi_ip30_data *d = (struct sgi_ip30_data *) extra;
 	uint64_t idata = 0, odata = 0;
@@ -273,9 +267,7 @@
 /*
  *  dev_sgi_ip30_4_access():
  */
-int dev_sgi_ip30_4_access(struct cpu *cpu, struct memory *mem,
-	uint64_t relative_addr, unsigned char *data, size_t len,
-	int writeflag, void *extra)
+DEVICE_ACCESS(sgi_ip30_4)
 {
 	struct sgi_ip30_data *d = (struct sgi_ip30_data *) extra;
 	uint64_t idata = 0, odata = 0;
@@ -319,9 +311,7 @@
 /*
  *  dev_sgi_ip30_5_access():
  */
-int dev_sgi_ip30_5_access(struct cpu *cpu, struct memory *mem,
-	uint64_t relative_addr, unsigned char *data, size_t len,
-	int writeflag, void *extra)
+DEVICE_ACCESS(sgi_ip30_5)
 {
 	struct sgi_ip30_data *d = (struct sgi_ip30_data *) extra;
 	uint64_t idata = 0, odata = 0;
@@ -369,15 +359,15 @@
 
 	memory_device_register(mem, "sgi_ip30_1", baseaddr,
 	    DEV_SGI_IP30_LENGTH, dev_sgi_ip30_access, (void *)d,
-	    MEM_DEFAULT, NULL);
+	    DM_DEFAULT, NULL);
 	memory_device_register(mem, "sgi_ip30_2", 0x10000000,
-	    0x10000, dev_sgi_ip30_2_access, (void *)d, MEM_DEFAULT, NULL);
+	    0x10000, dev_sgi_ip30_2_access, (void *)d, DM_DEFAULT, NULL);
 	memory_device_register(mem, "sgi_ip30_3", 0x1f000000,
-	    0x10000, dev_sgi_ip30_3_access, (void *)d, MEM_DEFAULT, NULL);
+	    0x10000, dev_sgi_ip30_3_access, (void *)d, DM_DEFAULT, NULL);
 	memory_device_register(mem, "sgi_ip30_4", 0x1f600000,
-	    0x10000, dev_sgi_ip30_4_access, (void *)d, MEM_DEFAULT, NULL);
+	    0x10000, dev_sgi_ip30_4_access, (void *)d, DM_DEFAULT, NULL);
 	memory_device_register(mem, "sgi_ip30_5", 0x1f6c0000,
-	    0x10000, dev_sgi_ip30_5_access, (void *)d, MEM_DEFAULT, NULL);
+	    0x10000, dev_sgi_ip30_5_access, (void *)d, DM_DEFAULT, NULL);
 
 	machine_add_tickfunction(machine, dev_sgi_ip30_tick, d, 16);