--- trunk/src/devices/dev_ps2_gs.c	2007/10/08 16:19:23	20
+++ trunk/src/devices/dev_ps2_gs.c	2007/10/08 16:21:17	34
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2003-2005  Anders Gavare.  All rights reserved.
+ *  Copyright (C) 2003-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_ps2_gs.c,v 1.18 2005/11/13 00:14:09 debug Exp $
+ *  $Id: dev_ps2_gs.c,v 1.22 2006/12/30 13:30:58 debug Exp $
  *  
  *  Playstation 2 "graphics system".
  */
@@ -87,12 +87,11 @@
 /*
  *  dev_ps2_gs_access():
  */
-int dev_ps2_gs_access(struct cpu *cpu, struct memory *mem,
-	uint64_t relative_addr, unsigned char *data, size_t len,
-	int writeflag, void *extra)
+DEVICE_ACCESS(ps2_gs)
 {
 	uint64_t idata = 0, odata = 0;
-	int i, regnr;
+	size_t i;
+	int regnr;
 	struct gs_data *d = extra;
 
 	if (writeflag == MEM_WRITE)
@@ -144,7 +143,7 @@
  *
  *  TODO:  Make this clearer.
  */
-int devinit_ps2_gs(struct devinit *devinit)
+DEVINIT(ps2_gs)
 {
 	struct gs_data *d;
 	char str[100];