Konami compile fixups.

src/mame/audio/scramble.c

@@ -301,6 +301,8 @@ static UINT8 speech_cnt;
 
 static TIMER_CALLBACK( ad2083_step )
 {
+	const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM);
+
 	/* only 16 bytes needed ... The original dump is bad. This
      * is what is needed to get speech to work. The prom data has
      * been updated and marked as BAD_DUMP. The information below
@@ -327,8 +329,8 @@ static TIMER_CALLBACK( ad2083_step )
 	if (ctrl & 0x40)
 		speech_rom_address = 0;
 
-	tms5110_ctl_w(machine, 0, ctrl & 0x04 ? TMS5110_CMD_SPEAK : TMS5110_CMD_RESET);
+	tms5110_ctl_w(space, 0, ctrl & 0x04 ? TMS5110_CMD_SPEAK : TMS5110_CMD_RESET);
-	tms5110_pdc_w(machine, 0, ctrl & 0x02 ? 0 : 1);
+	tms5110_pdc_w(space, 0, ctrl & 0x02 ? 0 : 1);
 
 	if (!(ctrl & 0x80))
 		timer_set(ATTOTIME_IN_HZ(AD2083_TMS5110_CLOCK / 2),NULL,1,ad2083_step);

src/mame/drivers/tmnt.c

@@ -870,7 +870,7 @@ static void tmnt2_put_word(const address_space *space, UINT32 addr, UINT16 data)
 		if (!(offs & 0x0031))
 		{
 			offs = ((offs & 0x000e) >> 1) | ((offs & 0x1fc0) >> 3);
-			K053245_word_w(space->machine, offs, data, 0xffff);
+			K053245_word_w(space, offs, data, 0xffff);
 		}
 	}
 	else if (addr >= 0x104000/2 && addr <= 0x107fff/2) sunset_104000[addr-0x104000/2] = data;

src/mame/video/gradius3.c

@@ -119,9 +119,11 @@ WRITE16_HANDLER( gradius3_gfxram_w )
 
 VIDEO_UPDATE( gradius3 )
 {
+	const address_space *space = cpu_get_address_space(screen->machine->cpu[0], ADDRESS_SPACE_PROGRAM);
+
 	/* TODO: this kludge enforces the char banks. For some reason, they don't work otherwise. */
-	K052109_w(screen->machine,0x1d80,0x10);
+	K052109_w(space,0x1d80,0x10);
-	K052109_w(screen->machine,0x1f00,0x32);
+	K052109_w(space,0x1f00,0x32);
 
 	if (dirtygfx)
 	{

src/mame/video/gticlub.c

@@ -140,7 +140,7 @@ static void K001006_w(int chip, int offset, UINT32 data, UINT32 mem_mask)
 
 READ32_HANDLER(K001006_0_r)
 {
-	return K001006_r(space, 0, offset, mem_mask);
+	return K001006_r(space->machine, 0, offset, mem_mask);
 }
 
 WRITE32_HANDLER(K001006_0_w)
@@ -150,7 +150,7 @@ WRITE32_HANDLER(K001006_0_w)
 
 READ32_HANDLER(K001006_1_r)
 {
-	return K001006_r(space, 1, offset, mem_mask);
+	return K001006_r(space->machine, 1, offset, mem_mask);
 }
 
 WRITE32_HANDLER(K001006_1_w)

src/mame/video/konamiic.c

@@ -3154,7 +3154,7 @@ static UINT8 K053244_chip_r (running_machine *machine, int chip, int offset)
 
 READ8_HANDLER( K053244_r )
 {
-	return K053244_chip_r(space,0,offset);
+	return K053244_chip_r(space->machine,0,offset);
 }
 
 static void K053244_chip_w(int chip, int offset, int data)
@@ -4812,17 +4812,17 @@ static int K051316_rom_r(running_machine *machine, int chip, int offset)
 
 READ8_HANDLER( K051316_rom_0_r )
 {
-	return K051316_rom_r(space,0,offset);
+	return K051316_rom_r(space->machine,0,offset);
 }
 
 READ8_HANDLER( K051316_rom_1_r )
 {
-	return K051316_rom_r(space,1,offset);
+	return K051316_rom_r(space->machine,1,offset);
 }
 
 READ8_HANDLER( K051316_rom_2_r )
 {
-	return K051316_rom_r(space,2,offset);
+	return K051316_rom_r(space->machine,2,offset);
 }
 
 

src/mame/video/twin16.c

@@ -456,11 +456,13 @@ VIDEO_UPDATE( twin16 )
 
 VIDEO_EOF( twin16 )
 {
+	const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM);
+
 	if( twin16_spriteram_process_enable() && need_process_spriteram )
 		twin16_spriteram_process();
 
 	need_process_spriteram = 1;
 
-	buffer_spriteram16_w(machine,0,0,0xffff);
+	buffer_spriteram16_w(space,0,0,0xffff);
 }