--- trunk/src/devices/dev_ps2_stuff.c	2007/10/08 16:18:00	4
+++ trunk/src/devices/dev_ps2_stuff.c	2007/10/08 16:19:23	20
@@ -25,7 +25,7 @@
  *  SUCH DAMAGE.
  *   
  *
- *  $Id: dev_ps2_stuff.c,v 1.23 2005/04/11 22:55:42 debug Exp $
+ *  $Id: dev_ps2_stuff.c,v 1.25 2005/11/13 00:14:09 debug Exp $
  *  
  *  Playstation 2 misc. stuff:
  *
@@ -98,7 +98,8 @@
 	struct ps2_data *d = extra;
 	int timer_nr = 0;
 
-	idata = memory_readmax64(cpu, data, len);
+	if (writeflag == MEM_WRITE)
+		idata = memory_readmax64(cpu, data, len);
 
 	if (relative_addr >= 0x8000 && relative_addr < 0x8000 + DMAC_REGSIZE) {
 		regnr = (relative_addr - 0x8000) / 16;
@@ -334,7 +335,7 @@
 	d->other_memory_base[DMA_CH_GIF] = DEV_PS2_GIF_FAKE_BASE;
 
 	memory_device_register(mem, "ps2_stuff", baseaddr,
-	    DEV_PS2_STUFF_LENGTH, dev_ps2_stuff_access, d, MEM_DEFAULT, NULL);
+	    DEV_PS2_STUFF_LENGTH, dev_ps2_stuff_access, d, DM_DEFAULT, NULL);
 	machine_add_tickfunction(machine,
 	    dev_ps2_stuff_tick, d, TICK_STEPS_SHIFT);