From 6d7892ab139110afacb0af2cf38f15a8aa318e12 Mon Sep 17 00:00:00 2001 From: Fabio Priuli Date: Fri, 24 Dec 2010 08:56:21 +0000 Subject: [PATCH] s3c24xx.c: Fixing compiling process on Linux and MacOSX [qmc2] --- src/emu/machine/s3c2400.c | 2 +- src/emu/machine/s3c2410.c | 2 +- src/emu/machine/s3c2410.h | 2 +- src/emu/machine/s3c2440.c | 2 +- src/emu/machine/s3c24xx.c | 8 +++++++- src/mame/drivers/ghosteo.c | 2 +- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/emu/machine/s3c2400.c b/src/emu/machine/s3c2400.c index 05b506721ee..a3693004294 100644 --- a/src/emu/machine/s3c2400.c +++ b/src/emu/machine/s3c2400.c @@ -57,7 +57,7 @@ DEVICE_START( s3c2400 ) memory_install_readwrite32_device_handler( space, device, 0x14600040, 0x1460005b, 0, 0, s3c24xx_dma_2_r, s3c24xx_dma_2_w); memory_install_readwrite32_device_handler( space, device, 0x14600060, 0x1460007b, 0, 0, s3c24xx_dma_3_r, s3c24xx_dma_3_w); memory_install_readwrite32_device_handler( space, device, 0x14800000, 0x14800017, 0, 0, s3c24xx_clkpow_r, s3c24xx_clkpow_w); - memory_install_readwrite32_device_handler( space, device, 0x14a00000, 0x14a003ff, 0, 0, s3c24xx_lcd_r, s3c24xx_lcd_w); + memory_install_readwrite32_device_handler( space, device, 0x14a00000, 0x14a003ff, 0, 0, s3c2400_lcd_r, s3c24xx_lcd_w); memory_install_readwrite32_device_handler( space, device, 0x14a00400, 0x14a007ff, 0, 0, s3c24xx_lcd_palette_r, s3c24xx_lcd_palette_w); memory_install_readwrite32_device_handler( space, device, 0x15000000, 0x1500002b, 0, 0, s3c24xx_uart_0_r, s3c24xx_uart_0_w); memory_install_readwrite32_device_handler( space, device, 0x15004000, 0x1500402b, 0, 0, s3c24xx_uart_1_r, s3c24xx_uart_1_w); diff --git a/src/emu/machine/s3c2410.c b/src/emu/machine/s3c2410.c index fddf8cd0dd0..750cd4f440d 100644 --- a/src/emu/machine/s3c2410.c +++ b/src/emu/machine/s3c2410.c @@ -57,7 +57,7 @@ DEVICE_START( s3c2410 ) memory_install_readwrite32_device_handler( space, device, 0x4b000080, 0x4b0000a3, 0, 0, s3c24xx_dma_2_r, s3c24xx_dma_2_w); memory_install_readwrite32_device_handler( space, device, 0x4b0000c0, 0x4b0000e3, 0, 0, s3c24xx_dma_3_r, s3c24xx_dma_3_w); memory_install_readwrite32_device_handler( space, device, 0x4c000000, 0x4c000017, 0, 0, s3c24xx_clkpow_r, s3c24xx_clkpow_w); - memory_install_readwrite32_device_handler( space, device, 0x4d000000, 0x4d000063, 0, 0, s3c24xx_lcd_r, s3c24xx_lcd_w); + memory_install_readwrite32_device_handler( space, device, 0x4d000000, 0x4d000063, 0, 0, s3c2410_lcd_r, s3c24xx_lcd_w); memory_install_readwrite32_device_handler( space, device, 0x4d000400, 0x4d0007ff, 0, 0, s3c24xx_lcd_palette_r, s3c24xx_lcd_palette_w); memory_install_readwrite32_device_handler( space, device, 0x4e000000, 0x4e000017, 0, 0, s3c24xx_nand_r, s3c24xx_nand_w); memory_install_readwrite32_device_handler( space, device, 0x50000000, 0x5000002b, 0, 0, s3c24xx_uart_0_r, s3c24xx_uart_0_w); diff --git a/src/emu/machine/s3c2410.h b/src/emu/machine/s3c2410.h index 76cacf1a20b..1bfa228097a 100644 --- a/src/emu/machine/s3c2410.h +++ b/src/emu/machine/s3c2410.h @@ -36,7 +36,7 @@ enum DECLARE_LEGACY_DEVICE(S3C2410, s3c2410); -READ32_DEVICE_HANDLER( s3c24xx_lcd_r ); +READ32_DEVICE_HANDLER( s3c2410_lcd_r ); /******************************************************************************* TYPE DEFINITIONS diff --git a/src/emu/machine/s3c2440.c b/src/emu/machine/s3c2440.c index c2b34788b7f..2643046fa74 100644 --- a/src/emu/machine/s3c2440.c +++ b/src/emu/machine/s3c2440.c @@ -56,7 +56,7 @@ DEVICE_START( s3c2440 ) memory_install_readwrite32_device_handler( space, device, 0x4b000080, 0x4b0000a3, 0, 0, s3c24xx_dma_2_r, s3c24xx_dma_2_w); memory_install_readwrite32_device_handler( space, device, 0x4b0000c0, 0x4b0000e3, 0, 0, s3c24xx_dma_3_r, s3c24xx_dma_3_w); memory_install_readwrite32_device_handler( space, device, 0x4c000000, 0x4c00001b, 0, 0, s3c24xx_clkpow_r, s3c24xx_clkpow_w); - memory_install_readwrite32_device_handler( space, device, 0x4d000000, 0x4d000063, 0, 0, s3c24xx_lcd_r, s3c24xx_lcd_w); + memory_install_readwrite32_device_handler( space, device, 0x4d000000, 0x4d000063, 0, 0, s3c2440_lcd_r, s3c24xx_lcd_w); memory_install_readwrite32_device_handler( space, device, 0x4d000400, 0x4d0007ff, 0, 0, s3c24xx_lcd_palette_r, s3c24xx_lcd_palette_w); memory_install_readwrite32_device_handler( space, device, 0x4e000000, 0x4e00003f, 0, 0, s3c24xx_nand_r, s3c24xx_nand_w); memory_install_readwrite32_device_handler( space, device, 0x4f000000, 0x4f0000a3, 0, 0, s3c24xx_cam_r, s3c24xx_cam_w); diff --git a/src/emu/machine/s3c24xx.c b/src/emu/machine/s3c24xx.c index 5386e668ecf..87041da92e0 100644 --- a/src/emu/machine/s3c24xx.c +++ b/src/emu/machine/s3c24xx.c @@ -734,7 +734,13 @@ static UINT32 s3c24xx_video_update( running_device *device, screen_device *scree return 0; } -READ32_DEVICE_HANDLER( s3c24xx_lcd_r ) +#if defined(DEVICE_S3C2400) +READ32_DEVICE_HANDLER( s3c2400_lcd_r ) +#elif defined(DEVICE_S3C2410) +READ32_DEVICE_HANDLER( s3c2410_lcd_r ) +#elif defined(DEVICE_S3C2440) +READ32_DEVICE_HANDLER( s3c2440_lcd_r ) +#endif { s3c24xx_t *s3c24xx = get_token( device); UINT32 data = ((UINT32*)&s3c24xx->lcd.regs)[offset]; diff --git a/src/mame/drivers/ghosteo.c b/src/mame/drivers/ghosteo.c index 28ebcf6916c..da03edb143a 100644 --- a/src/mame/drivers/ghosteo.c +++ b/src/mame/drivers/ghosteo.c @@ -395,7 +395,7 @@ running_device* s3c2410; static READ32_HANDLER( bballoon_speedup_r ) { - UINT32 ret = s3c24xx_lcd_r(s3c2410, offset+0x10/4, mem_mask); + UINT32 ret = s3c2410_lcd_r(s3c2410, offset+0x10/4, mem_mask); int pc = cpu_get_pc(space->cpu);