summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/firebeat.c
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2008-04-03 07:36:23 +0000
committer Aaron Giles <aaron@aarongiles.com>2008-04-03 07:36:23 +0000
commitefbe64428a6f906768333dc49f44cf5e37ac0c34 (patch)
tree185e43b404e8623a5a946840979a014c03885917 /src/mame/drivers/firebeat.c
parent0d89ceb44bd48d774c9c12d13317dd56acc417f4 (diff)
Switched from ACCESSING_BYTE_*, ACCESSING_WORD_*, ACCESSING_DWORD_*
macros to ACCESSING_BITS_*_* macros.
Diffstat (limited to 'src/mame/drivers/firebeat.c')
-rw-r--r--src/mame/drivers/firebeat.c122
1 files changed, 61 insertions, 61 deletions
diff --git a/src/mame/drivers/firebeat.c b/src/mame/drivers/firebeat.c
index a0e004a35f0..1cd38720027 100644
--- a/src/mame/drivers/firebeat.c
+++ b/src/mame/drivers/firebeat.c
@@ -593,7 +593,7 @@ static void GCU_w(running_machine *machine, int chip, UINT32 offset, UINT32 data
//case 0x3c:
{
COMBINE_DATA( &gcu[chip].visible_area );
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
{
const device_config *screen = device_list_find_by_index(machine->config->devicelist, VIDEO_SCREEN, chip);
@@ -672,15 +672,15 @@ static READ32_HANDLER(input_r)
{
UINT32 r = 0;
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
r |= (readinputport(0) & 0xff) << 24;
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
r |= (readinputport(1) & 0xff) << 8;
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
r |= (readinputport(2) & 0xff);
}
@@ -703,19 +703,19 @@ static READ32_HANDLER( sensor_r )
static READ32_HANDLER(flashram_r)
{
UINT32 r = 0;
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
r |= (intelflash_read(0, (offset*4)+0) & 0xff) << 24;
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
r |= (intelflash_read(0, (offset*4)+1) & 0xff) << 16;
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
r |= (intelflash_read(0, (offset*4)+2) & 0xff) << 8;
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
r |= (intelflash_read(0, (offset*4)+3) & 0xff) << 0;
}
@@ -724,19 +724,19 @@ static READ32_HANDLER(flashram_r)
static WRITE32_HANDLER(flashram_w)
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
intelflash_write(0, (offset*4)+0, (data >> 24) & 0xff);
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
intelflash_write(0, (offset*4)+1, (data >> 16) & 0xff);
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
intelflash_write(0, (offset*4)+2, (data >> 8) & 0xff);
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
intelflash_write(0, (offset*4)+3, (data >> 0) & 0xff);
}
@@ -757,19 +757,19 @@ static READ32_HANDLER(soundflash_r)
offset &= 0x7ffff;
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
r |= (intelflash_read(chip, (offset*4)+0) & 0xff) << 24;
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
r |= (intelflash_read(chip, (offset*4)+1) & 0xff) << 16;
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
r |= (intelflash_read(chip, (offset*4)+2) & 0xff) << 8;
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
r |= (intelflash_read(chip, (offset*4)+3) & 0xff) << 0;
}
@@ -790,19 +790,19 @@ static WRITE32_HANDLER(soundflash_w)
offset &= 0x7ffff;
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
intelflash_write(chip, (offset*4)+0, (data >> 24) & 0xff);
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
intelflash_write(chip, (offset*4)+1, (data >> 16) & 0xff);
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
intelflash_write(chip, (offset*4)+2, (data >> 8) & 0xff);
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
intelflash_write(chip, (offset*4)+3, (data >> 0) & 0xff);
}
@@ -1222,19 +1222,19 @@ static READ32_HANDLER( comm_uart_r )
{
UINT32 r = 0;
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
r |= pc16552d_0_r(machine, (offset*4)+0) << 24;
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
r |= pc16552d_0_r(machine, (offset*4)+1) << 16;
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
r |= pc16552d_0_r(machine, (offset*4)+2) << 8;
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
r |= pc16552d_0_r(machine, (offset*4)+3) << 0;
}
@@ -1244,19 +1244,19 @@ static READ32_HANDLER( comm_uart_r )
static WRITE32_HANDLER( comm_uart_w )
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
pc16552d_0_w(machine, (offset*4)+0, (data >> 24) & 0xff);
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
pc16552d_0_w(machine, (offset*4)+1, (data >> 16) & 0xff);
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
pc16552d_0_w(machine, (offset*4)+2, (data >> 8) & 0xff);
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
pc16552d_0_w(machine, (offset*4)+3, (data >> 0) & 0xff);
}
@@ -1276,19 +1276,19 @@ static READ32_HANDLER( rtc_r )
int reg = offset * 4;
UINT32 r = 0;
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
r |= rtc65271_r((reg >> 8) & 0x1, (reg & 0xff) + 0) << 24;
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
r |= rtc65271_r((reg >> 8) & 0x1, (reg & 0xff) + 1) << 16;
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
r |= rtc65271_r((reg >> 8) & 0x1, (reg & 0xff) + 2) << 8;
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
r |= rtc65271_r((reg >> 8) & 0x1, (reg & 0xff) + 3) << 0;
}
@@ -1299,19 +1299,19 @@ static READ32_HANDLER( rtc_r )
static WRITE32_HANDLER( rtc_w )
{
int reg = offset * 4;
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
rtc65271_w((reg >> 8) & 0x1, (reg & 0xff) + 0, (data >> 24) & 0xff);
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
rtc65271_w((reg >> 8) & 0x1, (reg & 0xff) + 1, (data >> 16) & 0xff);
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
rtc65271_w((reg >> 8) & 0x1, (reg & 0xff) + 2, (data >> 8) & 0xff);
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
rtc65271_w((reg >> 8) & 0x1, (reg & 0xff) + 3, (data >> 0) & 0xff);
}
@@ -1325,11 +1325,11 @@ static READ32_HANDLER( sound_r )
// printf("sound_r: %08X, %08X\n", offset, mem_mask);
- if (ACCESSING_BYTE_3) /* External RAM read */
+ if (ACCESSING_BITS_24_31) /* External RAM read */
{
r |= YMZ280B_data_0_r(machine, offset) << 24;
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
r |= YMZ280B_status_0_r(machine, offset) << 16;
}
@@ -1340,11 +1340,11 @@ static READ32_HANDLER( sound_r )
static WRITE32_HANDLER( sound_w )
{
// printf("sound_w: %08X, %08X, %08X\n", offset, data, mem_mask);
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
YMZ280B_register_0_w(machine, offset, (data >> 24) & 0xff);
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
YMZ280B_data_0_w(machine, offset, (data >> 16) & 0xff);
}
@@ -1397,7 +1397,7 @@ static READ32_HANDLER( midi_uart_r )
{
UINT32 r = 0;
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
r |= pc16552d_1_r(machine, offset >> 6) << 24;
}
@@ -1407,7 +1407,7 @@ static READ32_HANDLER( midi_uart_r )
static WRITE32_HANDLER( midi_uart_w )
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
pc16552d_1_w(machine, offset >> 6, (data >> 24) & 0xff);
}
@@ -1518,7 +1518,7 @@ static READ32_HANDLER( extend_board_irq_r)
{
UINT32 r = 0;
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
r |= (~extend_board_irq_active) << 24;
}
@@ -1530,7 +1530,7 @@ static WRITE32_HANDLER( extend_board_irq_w )
{
// printf("extend_board_irq_w: %08X, %08X, %08X\n", data, offset, mem_mask);
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
extend_board_irq_active &= ~((data >> 24) & 0xff);
@@ -1543,7 +1543,7 @@ static WRITE32_HANDLER( extend_board_irq_w )
static WRITE32_HANDLER( lamp_output_w )
{
// -------- -------- -------- xxxxxxxx Status LEDs (active low)
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
output_set_value("status_led_0", (data & 0x01) ? 0 : 1);
output_set_value("status_led_1", (data & 0x02) ? 0 : 1);
@@ -1562,13 +1562,13 @@ static WRITE32_HANDLER( lamp_output_kbm_w )
{
lamp_output_w(machine, offset, data, mem_mask);
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
output_set_value("door_lamp", (data & 0x10000000) ? 1 : 0);
output_set_value("start1p", (data & 0x01000000) ? 1 : 0);
output_set_value("start2p", (data & 0x02000000) ? 1 : 0);
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
output_set_value("lamp1", (data & 0x00000100) ? 1 : 0);
output_set_value("lamp2", (data & 0x00000200) ? 1 : 0);
@@ -1595,7 +1595,7 @@ static WRITE32_HANDLER( lamp_output_ppp_w )
// 0x00020000 Stage LED 5
// 0x00040000 Stage LED 6
// 0x00080000 Stage LED 7
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
output_set_value("left", (data & 0x00000100) ? 1 : 0);
output_set_value("right", (data & 0x00000200) ? 1 : 0);
@@ -1603,14 +1603,14 @@ static WRITE32_HANDLER( lamp_output_ppp_w )
output_set_value("ok", (data & 0x00000800) ? 1 : 0);
output_set_value("slim", (data & 0x00008000) ? 1 : 0);
}
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
output_set_value("stage_led_0", (data & 0x01000000) ? 1 : 0);
output_set_value("stage_led_1", (data & 0x02000000) ? 1 : 0);
output_set_value("stage_led_2", (data & 0x04000000) ? 1 : 0);
output_set_value("stage_led_3", (data & 0x08000000) ? 1 : 0);
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
output_set_value("stage_led_4", (data & 0x00010000) ? 1 : 0);
output_set_value("stage_led_5", (data & 0x00020000) ? 1 : 0);
@@ -1637,14 +1637,14 @@ static WRITE32_HANDLER( lamp_output2_ppp_w )
// 0x00000002 Top LED 5
// 0x00000004 Top LED 6
// 0x00000008 Top LED 7
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
output_set_value("top_led_0", (data & 0x00010000) ? 1 : 0);
output_set_value("top_led_1", (data & 0x00020000) ? 1 : 0);
output_set_value("top_led_2", (data & 0x00040000) ? 1 : 0);
output_set_value("top_led_3", (data & 0x00080000) ? 1 : 0);
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
output_set_value("top_led_4", (data & 0x00000001) ? 1 : 0);
output_set_value("top_led_5", (data & 0x00000002) ? 1 : 0);
@@ -1667,7 +1667,7 @@ static WRITE32_HANDLER( lamp_output3_ppp_w )
// 0x00040000 Lamp 1
// 0x00100000 Lamp 2
// 0x00400000 Lamp 3
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
output_set_value("lamp_0", (data & 0x00010000) ? 1 : 0);
output_set_value("lamp_1", (data & 0x00040000) ? 1 : 0);
@@ -1684,19 +1684,19 @@ static READ32_HANDLER(ppc_spu_share_r)
{
UINT32 r = 0;
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
r |= spu_shared_ram[(offset * 4) + 0] << 24;
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
r |= spu_shared_ram[(offset * 4) + 1] << 16;
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
r |= spu_shared_ram[(offset * 4) + 2] << 8;
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
r |= spu_shared_ram[(offset * 4) + 3] << 0;
}
@@ -1706,19 +1706,19 @@ static READ32_HANDLER(ppc_spu_share_r)
static WRITE32_HANDLER(ppc_spu_share_w)
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
spu_shared_ram[(offset * 4) + 0] = (data >> 24) & 0xff;
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
spu_shared_ram[(offset * 4) + 1] = (data >> 16) & 0xff;
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
spu_shared_ram[(offset * 4) + 2] = (data >> 8) & 0xff;
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
spu_shared_ram[(offset * 4) + 3] = (data >> 0) & 0xff;
}