--- trunk/src/devices/dev_sgi_ip19.c	2007/10/08 16:19:11	18
+++ trunk/src/devices/dev_sgi_ip19.c	2007/10/08 16:21:17	34
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2004-2005  Anders Gavare.  All rights reserved.
+ *  Copyright (C) 2004-2007  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_ip19.c,v 1.14 2005/10/26 14:37:04 debug Exp $
+ *  $Id: dev_sgi_ip19.c,v 1.18 2006/12/30 13:30:59 debug Exp $
  *  
  *  SGI IP19 (and IP25) stuff.  The stuff in here is mostly guesswork.
  */
@@ -51,9 +51,7 @@
 /*
  *  dev_sgi_ip19_access():
  */
-int dev_sgi_ip19_access(struct cpu *cpu, struct memory *mem,
-	uint64_t relative_addr, unsigned char *data, size_t len,
-	int writeflag, void *extra)
+DEVICE_ACCESS(sgi_ip19)
 {
 	struct sgi_ip19_data *d = (struct sgi_ip19_data *) extra;
 	uint64_t idata = 0, odata = 0;
@@ -113,10 +111,7 @@
 }
 
 
-/*
- *  devinit__sgi_ip19():
- */
-int devinit_sgi_ip19(struct devinit *devinit)
+DEVINIT(sgi_ip19)
 {
 	struct sgi_ip19_data *d = malloc(sizeof(struct sgi_ip19_data));
 	if (d == NULL) {
@@ -127,7 +122,7 @@
 
 	memory_device_register(devinit->machine->memory, devinit->name,
 	    devinit->addr, DEV_SGI_IP19_LENGTH,
-	    dev_sgi_ip19_access, (void *)d, MEM_DEFAULT, NULL);
+	    dev_sgi_ip19_access, (void *)d, DM_DEFAULT, NULL);
 
 	return 1;
 }