Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-23 17:00:53 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

New macros added for checking mem_mask. ACCESSING_BYTE_n, ACCESSING_WORD_n & ACCESSING_DWORD_n. These check for any access within the bounds, currently the pattern for checking whether both bytes of a word is written is to make two byte checks ( this pattern existed before because there was no macro for testing a 16 bit word, though you could have used ACCESSING_LSW32 ).

Browse Source 
All occurrences of ACCESSING_LSB, ACCESSING_MSB, ACCESSING_LSB16, ACCESSING_MSB16, ACCESSING_LSB32, ACCESSING_MSB32, ACCESSING_LSW32, ACCESSING_MSW32 & simple mem_mask checks have been replace with the new macros.
The old macros are gone.
This commit is contained in:
smf- 2008-03-30 09:19:23 +00:00
parent c646da31ad
commit ad4ef5d256
368 changed files with 2033 additions and 2032 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/emu/cpu/mips/mips3com.c
View File

@ -894,9 +894,9 @@ static UINT64 program_read_qword_32be(offs_t offset)
static UINT64 program_read_qword_masked_32be(offs_t offset, UINT64 mem_mask)
{
UINT64 result = 0;
if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000))
if (ACCESSING_DWORD_1)
result |= (UINT64)program_read_masked_32be(offset, mem_mask >> 32) << 32;
if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff))
if (ACCESSING_DWORD_0)
result |= program_read_masked_32be(offset + 4, mem_mask);
return result;
}
@ -922,9 +922,9 @@ static UINT64 program_read_qword_32le(offs_t offset)
static UINT64 program_read_qword_masked_32le(offs_t offset, UINT64 mem_mask)
{
UINT64 result = 0;
if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff))
if (ACCESSING_DWORD_0)
result |= program_read_masked_32le(offset, mem_mask);
if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000))
if (ACCESSING_DWORD_1)
result |= (UINT64)program_read_masked_32le(offset + 4, mem_mask >> 32) << 32;
return result;
}
@ -949,9 +949,9 @@ static void program_write_qword_32be(offs_t offset, UINT64 data)
static void program_write_qword_masked_32be(offs_t offset, UINT64 data, UINT64 mem_mask)
{
if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000))
if (ACCESSING_DWORD_1)
program_write_masked_32be(offset, data >> 32, mem_mask >> 32);
if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff))
if (ACCESSING_DWORD_0)
program_write_masked_32be(offset + 4, data, mem_mask);
}
@ -975,8 +975,8 @@ static void program_write_qword_32le(offs_t offset, UINT64 data)
static void program_write_qword_masked_32le(offs_t offset, UINT64 data, UINT64 mem_mask)
{
if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff))
if (ACCESSING_DWORD_0)
program_write_masked_32le(offset, data, mem_mask);
if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000))
if (ACCESSING_DWORD_1)
program_write_masked_32le(offset + 4, data >> 32, mem_mask >> 32);
}

64
src/emu/machine/6821pia.c
View File

@ -1209,14 +1209,14 @@ READ16_HANDLER( pia_5_lsb_r ) { return pia_read(5, offset); }
READ16_HANDLER( pia_6_lsb_r ) { return pia_read(6, offset); }
READ16_HANDLER( pia_7_lsb_r ) { return pia_read(7, offset); }
WRITE16_HANDLER( pia_0_lsb_w ) { if (ACCESSING_LSB) pia_write(0, offset, data); }
WRITE16_HANDLER( pia_1_lsb_w ) { if (ACCESSING_LSB) pia_write(1, offset, data); }
WRITE16_HANDLER( pia_2_lsb_w ) { if (ACCESSING_LSB) pia_write(2, offset, data); }
WRITE16_HANDLER( pia_3_lsb_w ) { if (ACCESSING_LSB) pia_write(3, offset, data); }
WRITE16_HANDLER( pia_4_lsb_w ) { if (ACCESSING_LSB) pia_write(4, offset, data); }
WRITE16_HANDLER( pia_5_lsb_w ) { if (ACCESSING_LSB) pia_write(5, offset, data); }
WRITE16_HANDLER( pia_6_lsb_w ) { if (ACCESSING_LSB) pia_write(6, offset, data); }
WRITE16_HANDLER( pia_7_lsb_w ) { if (ACCESSING_LSB) pia_write(7, offset, data); }
WRITE16_HANDLER( pia_0_lsb_w ) { if (ACCESSING_BYTE_0) pia_write(0, offset, data); }
WRITE16_HANDLER( pia_1_lsb_w ) { if (ACCESSING_BYTE_0) pia_write(1, offset, data); }
WRITE16_HANDLER( pia_2_lsb_w ) { if (ACCESSING_BYTE_0) pia_write(2, offset, data); }
WRITE16_HANDLER( pia_3_lsb_w ) { if (ACCESSING_BYTE_0) pia_write(3, offset, data); }
WRITE16_HANDLER( pia_4_lsb_w ) { if (ACCESSING_BYTE_0) pia_write(4, offset, data); }
WRITE16_HANDLER( pia_5_lsb_w ) { if (ACCESSING_BYTE_0) pia_write(5, offset, data); }
WRITE16_HANDLER( pia_6_lsb_w ) { if (ACCESSING_BYTE_0) pia_write(6, offset, data); }
WRITE16_HANDLER( pia_7_lsb_w ) { if (ACCESSING_BYTE_0) pia_write(7, offset, data); }
READ16_HANDLER( pia_0_lsb_alt_r ) { return pia_alt_read(0, offset); }
READ16_HANDLER( pia_1_lsb_alt_r ) { return pia_alt_read(1, offset); }
@ -1227,14 +1227,14 @@ READ16_HANDLER( pia_5_lsb_alt_r ) { return pia_alt_read(5, offset); }
READ16_HANDLER( pia_6_lsb_alt_r ) { return pia_alt_read(6, offset); }
READ16_HANDLER( pia_7_lsb_alt_r ) { return pia_alt_read(7, offset); }
WRITE16_HANDLER( pia_0_lsb_alt_w ) { if (ACCESSING_LSB) pia_alt_write(0, offset, data); }
WRITE16_HANDLER( pia_1_lsb_alt_w ) { if (ACCESSING_LSB) pia_alt_write(1, offset, data); }
WRITE16_HANDLER( pia_2_lsb_alt_w ) { if (ACCESSING_LSB) pia_alt_write(2, offset, data); }
WRITE16_HANDLER( pia_3_lsb_alt_w ) { if (ACCESSING_LSB) pia_alt_write(3, offset, data); }
WRITE16_HANDLER( pia_4_lsb_alt_w ) { if (ACCESSING_LSB) pia_alt_write(4, offset, data); }
WRITE16_HANDLER( pia_5_lsb_alt_w ) { if (ACCESSING_LSB) pia_alt_write(5, offset, data); }
WRITE16_HANDLER( pia_6_lsb_alt_w ) { if (ACCESSING_LSB) pia_alt_write(6, offset, data); }
WRITE16_HANDLER( pia_7_lsb_alt_w ) { if (ACCESSING_LSB) pia_alt_write(7, offset, data); }
WRITE16_HANDLER( pia_0_lsb_alt_w ) { if (ACCESSING_BYTE_0) pia_alt_write(0, offset, data); }
WRITE16_HANDLER( pia_1_lsb_alt_w ) { if (ACCESSING_BYTE_0) pia_alt_write(1, offset, data); }
WRITE16_HANDLER( pia_2_lsb_alt_w ) { if (ACCESSING_BYTE_0) pia_alt_write(2, offset, data); }
WRITE16_HANDLER( pia_3_lsb_alt_w ) { if (ACCESSING_BYTE_0) pia_alt_write(3, offset, data); }
WRITE16_HANDLER( pia_4_lsb_alt_w ) { if (ACCESSING_BYTE_0) pia_alt_write(4, offset, data); }
WRITE16_HANDLER( pia_5_lsb_alt_w ) { if (ACCESSING_BYTE_0) pia_alt_write(5, offset, data); }
WRITE16_HANDLER( pia_6_lsb_alt_w ) { if (ACCESSING_BYTE_0) pia_alt_write(6, offset, data); }
WRITE16_HANDLER( pia_7_lsb_alt_w ) { if (ACCESSING_BYTE_0) pia_alt_write(7, offset, data); }
/******************* Standard 16-bit CPU interfaces, D8-D15 *******************/
@ -1247,14 +1247,14 @@ READ16_HANDLER( pia_5_msb_r ) { return pia_read(5, offset) << 8; }
READ16_HANDLER( pia_6_msb_r ) { return pia_read(6, offset) << 8; }
READ16_HANDLER( pia_7_msb_r ) { return pia_read(7, offset) << 8; }
WRITE16_HANDLER( pia_0_msb_w ) { if (ACCESSING_MSB) pia_write(0, offset, data >> 8); }
WRITE16_HANDLER( pia_1_msb_w ) { if (ACCESSING_MSB) pia_write(1, offset, data >> 8); }
WRITE16_HANDLER( pia_2_msb_w ) { if (ACCESSING_MSB) pia_write(2, offset, data >> 8); }
WRITE16_HANDLER( pia_3_msb_w ) { if (ACCESSING_MSB) pia_write(3, offset, data >> 8); }
WRITE16_HANDLER( pia_4_msb_w ) { if (ACCESSING_MSB) pia_write(4, offset, data >> 8); }
WRITE16_HANDLER( pia_5_msb_w ) { if (ACCESSING_MSB) pia_write(5, offset, data >> 8); }
WRITE16_HANDLER( pia_6_msb_w ) { if (ACCESSING_MSB) pia_write(6, offset, data >> 8); }
WRITE16_HANDLER( pia_7_msb_w ) { if (ACCESSING_MSB) pia_write(7, offset, data >> 8); }
WRITE16_HANDLER( pia_0_msb_w ) { if (ACCESSING_BYTE_1) pia_write(0, offset, data >> 8); }
WRITE16_HANDLER( pia_1_msb_w ) { if (ACCESSING_BYTE_1) pia_write(1, offset, data >> 8); }
WRITE16_HANDLER( pia_2_msb_w ) { if (ACCESSING_BYTE_1) pia_write(2, offset, data >> 8); }
WRITE16_HANDLER( pia_3_msb_w ) { if (ACCESSING_BYTE_1) pia_write(3, offset, data >> 8); }
WRITE16_HANDLER( pia_4_msb_w ) { if (ACCESSING_BYTE_1) pia_write(4, offset, data >> 8); }
WRITE16_HANDLER( pia_5_msb_w ) { if (ACCESSING_BYTE_1) pia_write(5, offset, data >> 8); }
WRITE16_HANDLER( pia_6_msb_w ) { if (ACCESSING_BYTE_1) pia_write(6, offset, data >> 8); }
WRITE16_HANDLER( pia_7_msb_w ) { if (ACCESSING_BYTE_1) pia_write(7, offset, data >> 8); }
READ16_HANDLER( pia_0_msb_alt_r ) { return pia_alt_read(0, offset) << 8; }
READ16_HANDLER( pia_1_msb_alt_r ) { return pia_alt_read(1, offset) << 8; }
@ -1265,14 +1265,14 @@ READ16_HANDLER( pia_5_msb_alt_r ) { return pia_alt_read(5, offset) << 8; }
READ16_HANDLER( pia_6_msb_alt_r ) { return pia_alt_read(6, offset) << 8; }
READ16_HANDLER( pia_7_msb_alt_r ) { return pia_alt_read(7, offset) << 8; }
WRITE16_HANDLER( pia_0_msb_alt_w ) { if (ACCESSING_MSB) pia_alt_write(0, offset, data >> 8); }
WRITE16_HANDLER( pia_1_msb_alt_w ) { if (ACCESSING_MSB) pia_alt_write(1, offset, data >> 8); }
WRITE16_HANDLER( pia_2_msb_alt_w ) { if (ACCESSING_MSB) pia_alt_write(2, offset, data >> 8); }
WRITE16_HANDLER( pia_3_msb_alt_w ) { if (ACCESSING_MSB) pia_alt_write(3, offset, data >> 8); }
WRITE16_HANDLER( pia_4_msb_alt_w ) { if (ACCESSING_MSB) pia_alt_write(4, offset, data >> 8); }
WRITE16_HANDLER( pia_5_msb_alt_w ) { if (ACCESSING_MSB) pia_alt_write(5, offset, data >> 8); }
WRITE16_HANDLER( pia_6_msb_alt_w ) { if (ACCESSING_MSB) pia_alt_write(6, offset, data >> 8); }
WRITE16_HANDLER( pia_7_msb_alt_w ) { if (ACCESSING_MSB) pia_alt_write(7, offset, data >> 8); }
WRITE16_HANDLER( pia_0_msb_alt_w ) { if (ACCESSING_BYTE_1) pia_alt_write(0, offset, data >> 8); }
WRITE16_HANDLER( pia_1_msb_alt_w ) { if (ACCESSING_BYTE_1) pia_alt_write(1, offset, data >> 8); }
WRITE16_HANDLER( pia_2_msb_alt_w ) { if (ACCESSING_BYTE_1) pia_alt_write(2, offset, data >> 8); }
WRITE16_HANDLER( pia_3_msb_alt_w ) { if (ACCESSING_BYTE_1) pia_alt_write(3, offset, data >> 8); }
WRITE16_HANDLER( pia_4_msb_alt_w ) { if (ACCESSING_BYTE_1) pia_alt_write(4, offset, data >> 8); }
WRITE16_HANDLER( pia_5_msb_alt_w ) { if (ACCESSING_BYTE_1) pia_alt_write(5, offset, data >> 8); }
WRITE16_HANDLER( pia_6_msb_alt_w ) { if (ACCESSING_BYTE_1) pia_alt_write(6, offset, data >> 8); }
WRITE16_HANDLER( pia_7_msb_alt_w ) { if (ACCESSING_BYTE_1) pia_alt_write(7, offset, data >> 8); }
/******************* 8-bit A/B port interfaces *******************/

16
src/emu/machine/6840ptm.c
View File

@ -809,17 +809,17 @@ READ16_HANDLER( ptm6840_1_msb_r ) { return ptm6840_read(1, offset) << 8; }
READ16_HANDLER( ptm6840_2_msb_r ) { return ptm6840_read(2, offset) << 8; }
READ16_HANDLER( ptm6840_3_msb_r ) { return ptm6840_read(3, offset) << 8; }
WRITE16_HANDLER( ptm6840_0_msb_w ) { if (ACCESSING_MSB) ptm6840_write(0, offset, data >> 8); }
WRITE16_HANDLER( ptm6840_1_msb_w ) { if (ACCESSING_MSB) ptm6840_write(1, offset, data >> 8); }
WRITE16_HANDLER( ptm6840_2_msb_w ) { if (ACCESSING_MSB) ptm6840_write(2, offset, data >> 8); }
WRITE16_HANDLER( ptm6840_3_msb_w ) { if (ACCESSING_MSB) ptm6840_write(3, offset, data >> 8); }
WRITE16_HANDLER( ptm6840_0_msb_w ) { if (ACCESSING_BYTE_1) ptm6840_write(0, offset, data >> 8); }
WRITE16_HANDLER( ptm6840_1_msb_w ) { if (ACCESSING_BYTE_1) ptm6840_write(1, offset, data >> 8); }
WRITE16_HANDLER( ptm6840_2_msb_w ) { if (ACCESSING_BYTE_1) ptm6840_write(2, offset, data >> 8); }
WRITE16_HANDLER( ptm6840_3_msb_w ) { if (ACCESSING_BYTE_1) ptm6840_write(3, offset, data >> 8); }
READ16_HANDLER( ptm6840_0_lsb_r ) { return ptm6840_read(0, offset); }
READ16_HANDLER( ptm6840_1_lsb_r ) { return ptm6840_read(1, offset); }
READ16_HANDLER( ptm6840_2_lsb_r ) { return ptm6840_read(2, offset); }
READ16_HANDLER( ptm6840_3_lsb_r ) { return ptm6840_read(3, offset); }
WRITE16_HANDLER( ptm6840_0_lsb_w ) { if (ACCESSING_LSB) ptm6840_write(0, offset, data & 0xff); }
WRITE16_HANDLER( ptm6840_1_lsb_w ) { if (ACCESSING_LSB) ptm6840_write(1, offset, data & 0xff); }
WRITE16_HANDLER( ptm6840_2_lsb_w ) { if (ACCESSING_LSB) ptm6840_write(2, offset, data & 0xff); }
WRITE16_HANDLER( ptm6840_3_lsb_w ) { if (ACCESSING_LSB) ptm6840_write(3, offset, data & 0xff); }
WRITE16_HANDLER( ptm6840_0_lsb_w ) { if (ACCESSING_BYTE_0) ptm6840_write(0, offset, data & 0xff); }
WRITE16_HANDLER( ptm6840_1_lsb_w ) { if (ACCESSING_BYTE_0) ptm6840_write(1, offset, data & 0xff); }
WRITE16_HANDLER( ptm6840_2_lsb_w ) { if (ACCESSING_BYTE_0) ptm6840_write(2, offset, data & 0xff); }
WRITE16_HANDLER( ptm6840_3_lsb_w ) { if (ACCESSING_BYTE_0) ptm6840_write(3, offset, data & 0xff); }

32
src/emu/machine/6850acia.c
View File

@ -692,22 +692,22 @@ READ16_HANDLER( acia6850_1_data_msb_r ) { return acia6850_data_r(1) << 8; }
READ16_HANDLER( acia6850_2_data_msb_r ) { return acia6850_data_r(2) << 8; }
READ16_HANDLER( acia6850_3_data_msb_r ) { return acia6850_data_r(3) << 8; }
WRITE16_HANDLER( acia6850_0_ctrl_msb_w ) { if (ACCESSING_MSB) acia6850_ctrl_w(0, (data >> 8) & 0xff); }
WRITE16_HANDLER( acia6850_1_ctrl_msb_w ) { if (ACCESSING_MSB) acia6850_ctrl_w(1, (data >> 8) & 0xff); }
WRITE16_HANDLER( acia6850_2_ctrl_msb_w ) { if (ACCESSING_MSB) acia6850_ctrl_w(2, (data >> 8) & 0xff); }
WRITE16_HANDLER( acia6850_3_ctrl_msb_w ) { if (ACCESSING_MSB) acia6850_ctrl_w(3, (data >> 8) & 0xff); }
WRITE16_HANDLER( acia6850_0_ctrl_msb_w ) { if (ACCESSING_BYTE_1) acia6850_ctrl_w(0, (data >> 8) & 0xff); }
WRITE16_HANDLER( acia6850_1_ctrl_msb_w ) { if (ACCESSING_BYTE_1) acia6850_ctrl_w(1, (data >> 8) & 0xff); }
WRITE16_HANDLER( acia6850_2_ctrl_msb_w ) { if (ACCESSING_BYTE_1) acia6850_ctrl_w(2, (data >> 8) & 0xff); }
WRITE16_HANDLER( acia6850_3_ctrl_msb_w ) { if (ACCESSING_BYTE_1) acia6850_ctrl_w(3, (data >> 8) & 0xff); }
WRITE16_HANDLER( acia6850_0_ctrl_lsb_w ) { if (ACCESSING_LSB) acia6850_ctrl_w(0, data & 0xff); }
WRITE16_HANDLER( acia6850_1_ctrl_lsb_w ) { if (ACCESSING_LSB) acia6850_ctrl_w(1, data & 0xff); }
WRITE16_HANDLER( acia6850_2_ctrl_lsb_w ) { if (ACCESSING_LSB) acia6850_ctrl_w(2, data & 0xff); }
WRITE16_HANDLER( acia6850_3_ctrl_lsb_w ) { if (ACCESSING_LSB) acia6850_ctrl_w(3, data & 0xff); }
WRITE16_HANDLER( acia6850_0_ctrl_lsb_w ) { if (ACCESSING_BYTE_0) acia6850_ctrl_w(0, data & 0xff); }
WRITE16_HANDLER( acia6850_1_ctrl_lsb_w ) { if (ACCESSING_BYTE_0) acia6850_ctrl_w(1, data & 0xff); }
WRITE16_HANDLER( acia6850_2_ctrl_lsb_w ) { if (ACCESSING_BYTE_0) acia6850_ctrl_w(2, data & 0xff); }
WRITE16_HANDLER( acia6850_3_ctrl_lsb_w ) { if (ACCESSING_BYTE_0) acia6850_ctrl_w(3, data & 0xff); }
WRITE16_HANDLER( acia6850_0_data_msb_w ) { if (ACCESSING_MSB) acia6850_data_w(0, (data >> 8) & 0xff); }
WRITE16_HANDLER( acia6850_1_data_msb_w ) { if (ACCESSING_MSB) acia6850_data_w(1, (data >> 8) & 0xff); }
WRITE16_HANDLER( acia6850_2_data_msb_w ) { if (ACCESSING_MSB) acia6850_data_w(2, (data >> 8) & 0xff); }
WRITE16_HANDLER( acia6850_3_data_msb_w ) { if (ACCESSING_MSB) acia6850_data_w(3, (data >> 8) & 0xff); }
WRITE16_HANDLER( acia6850_0_data_msb_w ) { if (ACCESSING_BYTE_1) acia6850_data_w(0, (data >> 8) & 0xff); }
WRITE16_HANDLER( acia6850_1_data_msb_w ) { if (ACCESSING_BYTE_1) acia6850_data_w(1, (data >> 8) & 0xff); }
WRITE16_HANDLER( acia6850_2_data_msb_w ) { if (ACCESSING_BYTE_1) acia6850_data_w(2, (data >> 8) & 0xff); }
WRITE16_HANDLER( acia6850_3_data_msb_w ) { if (ACCESSING_BYTE_1) acia6850_data_w(3, (data >> 8) & 0xff); }
WRITE16_HANDLER( acia6850_0_data_lsb_w ) { if (ACCESSING_LSB) acia6850_data_w(0, data & 0xff); }
WRITE16_HANDLER( acia6850_1_data_lsb_w ) { if (ACCESSING_LSB) acia6850_data_w(1, data & 0xff); }
WRITE16_HANDLER( acia6850_2_data_lsb_w ) { if (ACCESSING_LSB) acia6850_data_w(2, data & 0xff); }
WRITE16_HANDLER( acia6850_3_data_lsb_w ) { if (ACCESSING_LSB) acia6850_data_w(3, data & 0xff); }
WRITE16_HANDLER( acia6850_0_data_lsb_w ) { if (ACCESSING_BYTE_0) acia6850_data_w(0, data & 0xff); }
WRITE16_HANDLER( acia6850_1_data_lsb_w ) { if (ACCESSING_BYTE_0) acia6850_data_w(1, data & 0xff); }
WRITE16_HANDLER( acia6850_2_data_lsb_w ) { if (ACCESSING_BYTE_0) acia6850_data_w(2, data & 0xff); }
WRITE16_HANDLER( acia6850_3_data_lsb_w ) { if (ACCESSING_BYTE_0) acia6850_data_w(3, data & 0xff); }

28
src/emu/machine/at28c16.c
View File

@ -150,7 +150,7 @@ static void at28c16_write( UINT32 chip, offs_t offset, UINT8 data )
static UINT16 at28c16_16msb_read( UINT32 chip, offs_t offset, UINT32 mem_mask )
{
UINT32 data = 0;
if( ACCESSING_MSB16 )
if( ACCESSING_BYTE_1 )
{
data |= at28c16_read( chip, offset ) << 8;
}
@ -159,7 +159,7 @@ static UINT16 at28c16_16msb_read( UINT32 chip, offs_t offset, UINT32 mem_mask )
static void at28c16_16msb_write( UINT32 chip, offs_t offset, UINT32 data, UINT32 mem_mask )
{
if( ACCESSING_MSB16 )
if( ACCESSING_BYTE_1 )
{
at28c16_write( chip, offset, data >> 8 );
}
@ -179,19 +179,19 @@ WRITE16_HANDLER( at28c16_16msb_3_w ) { at28c16_16msb_write( 3, offset, data, mem
static UINT32 at28c16_32le_read( UINT32 chip, offs_t offset, UINT32 mem_mask )
{
UINT32 data = 0;
if( ACCESSING_LSB32 )
if( ACCESSING_BYTE_0 )
{
data |= at28c16_read( chip, ( offset * 4 ) + 0 ) << 0;
}
if( ( mem_mask & 0x0000ff00 ) == 0 )
if( ACCESSING_BYTE_1 )
{
data |= at28c16_read( chip, ( offset * 4 ) + 1 ) << 8;
}
if( ( mem_mask & 0x00ff0000 ) == 0 )
if( ACCESSING_BYTE_2 )
{
data |= at28c16_read( chip, ( offset * 4 ) + 2 ) << 16;
}
if( ACCESSING_MSB32 )
if( ACCESSING_BYTE_3 )
{
data |= at28c16_read( chip, ( offset * 4 ) + 3 ) << 24;
}
@ -200,19 +200,19 @@ static UINT32 at28c16_32le_read( UINT32 chip, offs_t offset, UINT32 mem_mask )
static void at28c16_32le_write( UINT32 chip, offs_t offset, UINT32 data, UINT32 mem_mask )
{
if( ACCESSING_LSB32 )
if( ACCESSING_BYTE_0 )
{
at28c16_write( chip, ( offset * 4 ) + 0, data >> 0 );
}
if( ( mem_mask & 0x0000ff00 ) == 0 )
if( ACCESSING_BYTE_1 )
{
at28c16_write( chip, ( offset * 4 ) + 1, data >> 8 );
}
if( ( mem_mask & 0x00ff0000 ) == 0 )
if( ACCESSING_BYTE_2 )
{
at28c16_write( chip, ( offset * 4 ) + 2, data >> 16 );
}
if( ACCESSING_MSB32 )
if( ACCESSING_BYTE_3 )
{
at28c16_write( chip, ( offset * 4 ) + 3, data >> 24 );
}
@ -230,11 +230,11 @@ WRITE32_HANDLER( at28c16_32le_3_w ) { at28c16_32le_write( 3, offset, data, mem_m
static UINT32 at28c16_32le_16lsb_read( UINT32 chip, offs_t offset, UINT32 mem_mask )
{
UINT32 data = 0;
if( ACCESSING_LSB32 )
if( ACCESSING_BYTE_0 )
{
data |= at28c16_read( chip, ( offset * 2 ) + 0 ) << 0;
}
if( ( mem_mask & 0x00ff0000 ) == 0 )
if( ACCESSING_BYTE_2 )
{
data |= at28c16_read( chip, ( offset * 2 ) + 1 ) << 16;
}
@ -243,11 +243,11 @@ static UINT32 at28c16_32le_16lsb_read( UINT32 chip, offs_t offset, UINT32 mem_ma
static void at28c16_32le_16lsb_write( UINT32 chip, offs_t offset, UINT32 data, UINT32 mem_mask )
{
if( ACCESSING_LSB32 )
if( ACCESSING_BYTE_0 )
{
at28c16_write( chip, ( offset * 2 ) + 0, data >> 0 );
}
if( ( mem_mask & 0x00ff0000 ) == 0 )
if( ACCESSING_BYTE_2 )
{
at28c16_write( chip, ( offset * 2 ) + 1, data >> 16 );
}

16
src/emu/machine/idectrl.c
View File

@ -442,25 +442,25 @@ INLINE int convert_to_offset_and_size32(offs_t *offset, UINT32 mem_mask)
int size = 4;
/* determine which real offset */
if (mem_mask & 0x000000ff)
if (!ACCESSING_BYTE_0)
{
(*offset)++, size = 3;
if (mem_mask & 0x0000ff00)
if (!ACCESSING_BYTE_1)
{
(*offset)++, size = 2;
if (mem_mask & 0x00ff0000)
if (!ACCESSING_BYTE_2)
(*offset)++, size = 1;
}
}
/* determine the real size */
if (!(mem_mask & 0xff000000))
if (ACCESSING_BYTE_3)
return size;
size--;
if (!(mem_mask & 0x00ff0000))
if (ACCESSING_BYTE_2)
return size;
size--;
if (!(mem_mask & 0x0000ff00))
if (ACCESSING_BYTE_1)
return size;
size--;
return size;
@ -471,10 +471,10 @@ INLINE int convert_to_offset_and_size16(offs_t *offset, UINT32 mem_mask)
int size = 2;
/* determine which real offset */
if (mem_mask & 0x000000ff)
if (!ACCESSING_BYTE_0)
(*offset)++, size = 1;
if (!(mem_mask & 0x0000ff00))
if (ACCESSING_BYTE_1)
return size;
size--;
return size;

2
src/emu/machine/msm6242.c
View File

@ -135,6 +135,6 @@ READ16_HANDLER( msm6242_lsb_r )
WRITE16_HANDLER( msm6242_lsb_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
msm6242_w(machine, offset, data);
}

4
src/emu/machine/pit8253.c
View File

@ -1185,8 +1185,8 @@ WRITE8_HANDLER ( pit8253_1_w ) { pit8253_write(1, offset, data); }
READ16_HANDLER ( pit8253_0_lsb_r ) { return pit8253_read(0, offset); }
READ16_HANDLER ( pit8253_1_lsb_r ) { return pit8253_read(1, offset); }
WRITE16_HANDLER ( pit8253_0_lsb_w ) { if (ACCESSING_LSB) pit8253_write(0, offset, data); }
WRITE16_HANDLER ( pit8253_1_lsb_w ) { if (ACCESSING_LSB) pit8253_write(1, offset, data); }
WRITE16_HANDLER ( pit8253_0_lsb_w ) { if (ACCESSING_BYTE_0) pit8253_write(0, offset, data); }
WRITE16_HANDLER ( pit8253_1_lsb_w ) { if (ACCESSING_BYTE_0) pit8253_write(1, offset, data); }
READ16_HANDLER ( pit8253_16le_0_r ) { return read16le_with_read8_handler(pit8253_0_r, machine, offset, mem_mask); }
READ16_HANDLER ( pit8253_16le_1_r ) { return read16le_with_read8_handler(pit8253_1_r, machine, offset, mem_mask); }

6
src/emu/machine/smc91c9x.c
View File

@ -418,7 +418,7 @@ READ16_HANDLER( smc91c94_r )
switch (offset)
{
case EREG_PNR_ARR:
if (!(mem_mask & 0xff00))
if (ACCESSING_BYTE_1)
{
ethernet.reg[EREG_INTERRUPT] &= ~0x0008;
update_ethernet_irq();
@ -431,7 +431,7 @@ READ16_HANDLER( smc91c94_r )
UINT8 *buffer = (ethernet.reg[EREG_POINTER] & 0x8000) ? ethernet.rx : ethernet.tx;
int addr = ethernet.reg[EREG_POINTER] & 0x7ff;
result = buffer[addr++];
if (!(mem_mask & 0xff00))
if (ACCESSING_BYTE_1)
result |= buffer[addr++] << 8;
if (ethernet.reg[EREG_POINTER] & 0x4000)
ethernet.reg[EREG_POINTER] = (ethernet.reg[EREG_POINTER] & ~0x7ff) | (addr & 0x7ff);
@ -549,7 +549,7 @@ WRITE16_HANDLER( smc91c94_w )
UINT8 *buffer = (ethernet.reg[EREG_POINTER] & 0x8000) ? ethernet.rx : ethernet.tx;
int addr = ethernet.reg[EREG_POINTER] & 0x7ff;
buffer[addr++] = data;
if (!(mem_mask & 0xff00))
if (ACCESSING_BYTE_1)
buffer[addr++] = data >> 8;
if (ethernet.reg[EREG_POINTER] & 0x4000)
ethernet.reg[EREG_POINTER] = (ethernet.reg[EREG_POINTER] & ~0x7ff) | (addr & 0x7ff);

28
src/emu/machine/timekpr.c
View File

@ -414,7 +414,7 @@ WRITE8_HANDLER( timekeeper_0_w )
static UINT16 timekeeper_msb16_read( UINT32 chip, offs_t offset, UINT16 mem_mask )
{
UINT16 data = 0;
if( ACCESSING_MSB16 )
if( ACCESSING_BYTE_1 )
{
data |= timekeeper_read( chip, offset ) << 8;
}
@ -423,7 +423,7 @@ static UINT16 timekeeper_msb16_read( UINT32 chip, offs_t offset, UINT16 mem_mask
static void timekeeper_msb16_write( UINT32 chip, offs_t offset, UINT16 data, UINT16 mem_mask )
{
if( ACCESSING_MSB16 )
if( ACCESSING_BYTE_1 )
{
timekeeper_write( chip, offset, data >> 8 );
}
@ -437,19 +437,19 @@ WRITE16_HANDLER( timekeeper_0_msb16_w ) { timekeeper_msb16_write( 0, offset, dat
static UINT32 timekeeper_32be_read( UINT32 chip, offs_t offset, UINT32 mem_mask )
{
UINT32 data = 0;
if( ACCESSING_MSB32 )
if( ACCESSING_BYTE_3 )
{
data |= timekeeper_read( chip, ( offset * 4 ) + 0 ) << 24;
}
if( ( mem_mask & 0x00ff0000 ) == 0 )
if( ACCESSING_BYTE_2 )
{
data |= timekeeper_read( chip, ( offset * 4 ) + 1 ) << 16;
}
if( ( mem_mask & 0x0000ff00 ) == 0 )
if( ACCESSING_BYTE_1 )
{
data |= timekeeper_read( chip, ( offset * 4 ) + 2 ) << 8;
}
if( ACCESSING_LSB32 )
if( ACCESSING_BYTE_0 )
{
data |= timekeeper_read( chip, ( offset * 4 ) + 3 ) << 0;
}
@ -458,19 +458,19 @@ static UINT32 timekeeper_32be_read( UINT32 chip, offs_t offset, UINT32 mem_mask
static void timekeeper_32be_write( UINT32 chip, offs_t offset, UINT32 data, UINT32 mem_mask )
{
if( ACCESSING_MSB32 )
if( ACCESSING_BYTE_3 )
{
timekeeper_write( chip, ( offset * 4 ) + 0, data >> 24 );
}
if( ( mem_mask & 0x00ff0000 ) == 0 )
if( ACCESSING_BYTE_2 )
{
timekeeper_write( chip, ( offset * 4 ) + 1, data >> 16 );
}
if( ( mem_mask & 0x0000ff00 ) == 0 )
if( ACCESSING_BYTE_1 )
{
timekeeper_write( chip, ( offset * 4 ) + 2, data >> 8 );
}
if( ACCESSING_LSB32 )
if( ACCESSING_BYTE_0 )
{
timekeeper_write( chip, ( offset * 4 ) + 3, data >> 0 );
}
@ -482,11 +482,11 @@ WRITE32_HANDLER( timekeeper_0_32be_w ) { timekeeper_32be_write( 0, offset, data,
static UINT32 timekeeper_32le_lsb16_read( UINT32 chip, offs_t offset, UINT32 mem_mask )
{
UINT32 data = 0;
if( ACCESSING_LSB32 )
if( ACCESSING_BYTE_0 )
{
data |= timekeeper_read( chip, ( offset * 2 ) + 0 ) << 0;
}
if( ( mem_mask & 0x00ff0000 ) == 0 )
if( ACCESSING_BYTE_2 )
{
data |= timekeeper_read( chip, ( offset * 2 ) + 1 ) << 16;
}
@ -495,11 +495,11 @@ static UINT32 timekeeper_32le_lsb16_read( UINT32 chip, offs_t offset, UINT32 mem
static void timekeeper_32le_lsb16_write( UINT32 chip, offs_t offset, UINT32 data, UINT32 mem_mask )
{
if( ACCESSING_LSB32 )
if( ACCESSING_BYTE_0 )
{
timekeeper_write( chip, ( offset * 2 ) + 0, data >> 0 );
}
if( ( mem_mask & 0x00ff0000 ) == 0 )
if( ACCESSING_BYTE_2 )
{
timekeeper_write( chip, ( offset * 2 ) + 1, data >> 16 );
}

2
src/emu/machine/tmp68301.c
View File

@ -155,7 +155,7 @@ WRITE16_HANDLER( tmp68301_regs_w )
{
COMBINE_DATA(&tmp68301_regs[offset]);
if (!ACCESSING_LSB) return;
if (!ACCESSING_BYTE_0) return;
// logerror("CPU #0 PC %06X: TMP68301 Reg %04X<-%04X & %04X\n",activecpu_get_pc(),offset*2,data,mem_mask^0xffff);

176
src/emu/memconv.h
View File

@ -88,9 +88,9 @@
INLINE UINT16 read16be_with_read8_handler(read8_machine_func handler, void *param, offs_t offset, UINT16 mem_mask)
{
UINT16 result = 0;
if ((mem_mask & 0xff00) != 0xff00)
if (ACCESSING_BYTE_1)
result |= ((UINT16)(*handler)(param, offset * 2 + 0)) << 8;
if ((mem_mask & 0x00ff) != 0x00ff)
if (ACCESSING_BYTE_0)
result |= ((UINT16)(*handler)(param, offset * 2 + 1)) << 0;
return result;
}
@ -98,9 +98,9 @@ INLINE UINT16 read16be_with_read8_handler(read8_machine_func handler, void *para
INLINE void write16be_with_write8_handler(write8_machine_func handler, void *param, offs_t offset, UINT16 data, UINT16 mem_mask)
{
if ((mem_mask & 0xff00) != 0xff00)
if (ACCESSING_BYTE_1)
(*handler)(param, offset * 2 + 0, data >> 8);
if ((mem_mask & 0x00ff) != 0x00ff)
if (ACCESSING_BYTE_0)
(*handler)(param, offset * 2 + 1, data >> 0);
}
@ -114,9 +114,9 @@ INLINE void write16be_with_write8_handler(write8_machine_func handler, void *par
INLINE UINT16 read16le_with_read8_handler(read8_machine_func handler, void *param, offs_t offset, UINT16 mem_mask)
{
UINT16 result = 0;
if ((mem_mask & 0x00ff) != 0x00ff)
if (ACCESSING_BYTE_0)
result |= ((UINT16) (*handler)(param, offset * 2 + 0)) << 0;
if ((mem_mask & 0xff00) != 0xff00)
if (ACCESSING_BYTE_1)
result |= ((UINT16) (*handler)(param, offset * 2 + 1)) << 8;
return result;
}
@ -124,9 +124,9 @@ INLINE UINT16 read16le_with_read8_handler(read8_machine_func handler, void *para
INLINE void write16le_with_write8_handler(write8_machine_func handler, void *param, offs_t offset, UINT16 data, UINT16 mem_mask)
{
if ((mem_mask & 0x00ff) != 0x00ff)
if (ACCESSING_BYTE_0)
(*handler)(param, offset * 2 + 0, data >> 0);
if ((mem_mask & 0xff00) != 0xff00)
if (ACCESSING_BYTE_1)
(*handler)(param, offset * 2 + 1, data >> 8);
}
@ -140,9 +140,9 @@ INLINE void write16le_with_write8_handler(write8_machine_func handler, void *par
INLINE UINT32 read32be_with_read8_handler(read8_machine_func handler, void *param, offs_t offset, UINT32 mem_mask)
{
UINT32 result = 0;
if ((mem_mask & 0xffff0000) != 0xffff0000)
if (ACCESSING_WORD_1)
result |= read16be_with_read8_handler(handler, param, offset * 2 + 0, mem_mask >> 16) << 16;
if ((mem_mask & 0x0000ffff) != 0x0000ffff)
if (ACCESSING_WORD_0)
result |= read16be_with_read8_handler(handler, param, offset * 2 + 1, mem_mask) << 0;
return result;
}
@ -150,9 +150,9 @@ INLINE UINT32 read32be_with_read8_handler(read8_machine_func handler, void *para
INLINE void write32be_with_write8_handler(write8_machine_func handler, void *param, offs_t offset, UINT32 data, UINT32 mem_mask)
{
if ((mem_mask & 0xffff0000) != 0xffff0000)
if (ACCESSING_WORD_1)
write16be_with_write8_handler(handler, param, offset * 2 + 0, data >> 16, mem_mask >> 16);
if ((mem_mask & 0x0000ffff) != 0x0000ffff)
if (ACCESSING_WORD_0)
write16be_with_write8_handler(handler, param, offset * 2 + 1, data, mem_mask);
}
@ -166,9 +166,9 @@ INLINE void write32be_with_write8_handler(write8_machine_func handler, void *par
INLINE UINT32 read32le_with_read8_handler(read8_machine_func handler, void *param, offs_t offset, UINT32 mem_mask)
{
UINT32 result = 0;
if ((mem_mask & 0x0000ffff) != 0x0000ffff)
if (ACCESSING_WORD_0)
result |= read16le_with_read8_handler(handler, param, offset * 2 + 0, mem_mask) << 0;
if ((mem_mask & 0xffff0000) != 0xffff0000)
if (ACCESSING_WORD_1)
result |= read16le_with_read8_handler(handler, param, offset * 2 + 1, mem_mask >> 16) << 16;
return result;
}
@ -176,9 +176,9 @@ INLINE UINT32 read32le_with_read8_handler(read8_machine_func handler, void *para
INLINE void write32le_with_write8_handler(write8_machine_func handler, void *param, offs_t offset, UINT32 data, UINT32 mem_mask)
{
if ((mem_mask & 0x0000ffff) != 0x0000ffff)
if (ACCESSING_WORD_0)
write16le_with_write8_handler(handler, param, offset * 2 + 0, data, mem_mask);
if ((mem_mask & 0xffff0000) != 0xffff0000)
if (ACCESSING_WORD_1)
write16le_with_write8_handler(handler, param, offset * 2 + 1, data >> 16, mem_mask >> 16);
}
@ -192,9 +192,9 @@ INLINE void write32le_with_write8_handler(write8_machine_func handler, void *par
INLINE UINT32 read32be_with_16be_handler(read16_machine_func handler, void *param, offs_t offset, UINT32 mem_mask)
{
UINT32 result = 0;
if ((mem_mask & 0xffff0000) != 0xffff0000)
if (ACCESSING_WORD_1)
result |= (*handler)(param, offset * 2 + 0, mem_mask >> 16) << 16;
if ((mem_mask & 0x0000ffff) != 0x0000ffff)
if (ACCESSING_WORD_0)
result |= (*handler)(param, offset * 2 + 1, mem_mask) << 0;
return result;
}
@ -202,9 +202,9 @@ INLINE UINT32 read32be_with_16be_handler(read16_machine_func handler, void *para
INLINE void write32be_with_16be_handler(write16_machine_func handler, void *param, offs_t offset, UINT32 data, UINT32 mem_mask)
{
if ((mem_mask & 0xffff0000) != 0xffff0000)
if (ACCESSING_WORD_1)
(*handler)(param, offset * 2 + 0, data >> 16, mem_mask >> 16);
if ((mem_mask & 0x0000ffff) != 0x0000ffff)
if (ACCESSING_WORD_0)
(*handler)(param, offset * 2 + 1, data, mem_mask);
}
@ -218,9 +218,9 @@ INLINE void write32be_with_16be_handler(write16_machine_func handler, void *para
INLINE UINT32 read32le_with_16le_handler(read16_machine_func handler, void *param, offs_t offset, UINT32 mem_mask)
{
UINT32 result = 0;
if ((mem_mask & 0x0000ffff) != 0x0000ffff)
if (ACCESSING_WORD_0)
result |= (*handler)(param, offset * 2 + 0, mem_mask) << 0;
if ((mem_mask & 0xffff0000) != 0xffff0000)
if (ACCESSING_WORD_1)
result |= (*handler)(param, offset * 2 + 1, mem_mask >> 16) << 16;
return result;
}
@ -228,9 +228,9 @@ INLINE UINT32 read32le_with_16le_handler(read16_machine_func handler, void *para
INLINE void write32le_with_16le_handler(write16_machine_func handler, void *param, offs_t offset, UINT32 data, UINT32 mem_mask)
{
if ((mem_mask & 0x0000ffff) != 0x0000ffff)
if (ACCESSING_WORD_0)
(*handler)(param, offset * 2 + 0, data, mem_mask);
if ((mem_mask & 0xffff0000) != 0xffff0000)
if (ACCESSING_WORD_1)
(*handler)(param, offset * 2 + 1, data >> 16, mem_mask >> 16);
}
@ -290,9 +290,9 @@ INLINE void write32le_with_16be_handler(write16_machine_func handler, void *para
INLINE UINT64 read64be_with_read8_handler(read8_machine_func handler, void *param, offs_t offset, UINT64 mem_mask)
{
UINT64 result = 0;
if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000))
if (ACCESSING_DWORD_1)
result |= (UINT64)read32be_with_read8_handler(handler, param, offset * 2 + 0, mem_mask >> 32) << 32;
if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff))
if (ACCESSING_DWORD_0)
result |= (UINT64)read32be_with_read8_handler(handler, param, offset * 2 + 1, mem_mask) << 0;
return result;
}
@ -300,9 +300,9 @@ INLINE UINT64 read64be_with_read8_handler(read8_machine_func handler, void *para
INLINE void write64be_with_write8_handler(write8_machine_func handler, void *param, offs_t offset, UINT64 data, UINT64 mem_mask)
{
if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000))
if (ACCESSING_DWORD_1)
write32be_with_write8_handler(handler, param, offset * 2 + 0, data >> 32, mem_mask >> 32);
if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff))
if (ACCESSING_DWORD_0)
write32be_with_write8_handler(handler, param, offset * 2 + 1, data, mem_mask);
}
@ -316,9 +316,9 @@ INLINE void write64be_with_write8_handler(write8_machine_func handler, void *par
INLINE UINT64 read64le_with_read8_handler(read8_machine_func handler, void *param, offs_t offset, UINT64 mem_mask)
{
UINT64 result = 0;
if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff))
if (ACCESSING_DWORD_0)
result |= (UINT64)read32le_with_read8_handler(handler, param, offset * 2 + 0, mem_mask >> 0) << 0;
if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000))
if (ACCESSING_DWORD_1)
result |= (UINT64)read32le_with_read8_handler(handler, param, offset * 2 + 1, mem_mask >> 32) << 32;
return result;
}
@ -326,9 +326,9 @@ INLINE UINT64 read64le_with_read8_handler(read8_machine_func handler, void *para
INLINE void write64le_with_write8_handler(write8_machine_func handler, void *param, offs_t offset, UINT64 data, UINT64 mem_mask)
{
if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff))
if (ACCESSING_DWORD_0)
write32le_with_write8_handler(handler, param, offset * 2 + 0, data >> 0, mem_mask >> 0);
if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000))
if (ACCESSING_DWORD_1)
write32le_with_write8_handler(handler, param, offset * 2 + 1, data >> 32, mem_mask >> 32);
}
@ -342,9 +342,9 @@ INLINE void write64le_with_write8_handler(write8_machine_func handler, void *par
INLINE UINT32 read64be_with_16be_handler(read16_machine_func handler, void *param, offs_t offset, UINT64 mem_mask)
{
UINT64 result = 0;
if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000))
if (ACCESSING_DWORD_1)
result |= (UINT64)read32be_with_16be_handler(handler, param, offset * 2 + 0, mem_mask >> 32) << 32;
if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff))
if (ACCESSING_DWORD_0)
result |= (UINT64)read32be_with_16be_handler(handler, param, offset * 2 + 1, mem_mask >> 0) << 0;
return result;
}
@ -352,9 +352,9 @@ INLINE UINT32 read64be_with_16be_handler(read16_machine_func handler, void *para
INLINE void write64be_with_16be_handler(write16_machine_func handler, void *param, offs_t offset, UINT64 data, UINT64 mem_mask)
{
if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000))
if (ACCESSING_DWORD_1)
write32be_with_16be_handler(handler, param, offset * 2 + 0, data >> 32, mem_mask >> 32);
if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff))
if (ACCESSING_DWORD_0)
write32be_with_16be_handler(handler, param, offset * 2 + 1, data >> 0, mem_mask >> 0);
}
@ -368,9 +368,9 @@ INLINE void write64be_with_16be_handler(write16_machine_func handler, void *para
INLINE UINT32 read64le_with_16le_handler(read16_machine_func handler, void *param, offs_t offset, UINT64 mem_mask)
{
UINT64 result = 0;
if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff))
if (ACCESSING_DWORD_0)
result |= (UINT64)read32le_with_16le_handler(handler, param, offset * 2 + 0, mem_mask >> 0) << 0;
if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000))
if (ACCESSING_DWORD_1)
result |= (UINT64)read32le_with_16le_handler(handler, param, offset * 2 + 1, mem_mask >> 32) << 32;
return result;
}
@ -378,9 +378,9 @@ INLINE UINT32 read64le_with_16le_handler(read16_machine_func handler, void *para
INLINE void write64le_with_16le_handler(write16_machine_func handler, void *param, offs_t offset, UINT64 data, UINT64 mem_mask)
{
if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff))
if (ACCESSING_DWORD_0)
write32le_with_16le_handler(handler, param, offset * 2 + 0, data >> 0, mem_mask >> 0);
if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000))
if (ACCESSING_DWORD_1)
write32le_with_16le_handler(handler, param, offset * 2 + 1, data >> 32, mem_mask >> 32);
}
@ -394,9 +394,9 @@ INLINE void write64le_with_16le_handler(write16_machine_func handler, void *para
INLINE UINT32 read64be_with_16le_handler(read16_machine_func handler, void *param, offs_t offset, UINT64 mem_mask)
{
UINT64 result = 0;
if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000))
if (ACCESSING_DWORD_1)
result |= (UINT64)read32be_with_16le_handler(handler, param, offset * 2 + 0, mem_mask >> 32) << 32;
if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff))
if (ACCESSING_DWORD_0)
result |= (UINT64)read32be_with_16le_handler(handler, param, offset * 2 + 1, mem_mask >> 0) << 0;
return result;
}
@ -404,9 +404,9 @@ INLINE UINT32 read64be_with_16le_handler(read16_machine_func handler, void *para
INLINE void write64be_with_16le_handler(write16_machine_func handler, void *param, offs_t offset, UINT64 data, UINT64 mem_mask)
{
if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000))
if (ACCESSING_DWORD_1)
write32be_with_16le_handler(handler, param, offset * 2 + 0, data >> 32, mem_mask >> 32);
if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff))
if (ACCESSING_DWORD_0)
write32be_with_16le_handler(handler, param, offset * 2 + 1, data >> 0, mem_mask >> 0);
}
@ -420,9 +420,9 @@ INLINE void write64be_with_16le_handler(write16_machine_func handler, void *para
INLINE UINT32 read64le_with_16be_handler(read16_machine_func handler, void *param, offs_t offset, UINT64 mem_mask)
{
UINT64 result = 0;
if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff))
if (ACCESSING_DWORD_0)
result |= (UINT64)read32le_with_16be_handler(handler, param, offset * 2 + 0, mem_mask >> 0) << 0;
if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000))
if (ACCESSING_DWORD_1)
result |= (UINT64)read32le_with_16be_handler(handler, param, offset * 2 + 1, mem_mask >> 32) << 32;
return result;
}
@ -430,9 +430,9 @@ INLINE UINT32 read64le_with_16be_handler(read16_machine_func handler, void *para
INLINE void write64le_with_16be_handler(write16_machine_func handler, void *param, offs_t offset, UINT64 data, UINT64 mem_mask)
{
if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff))
if (ACCESSING_DWORD_0)
write32le_with_16be_handler(handler, param, offset * 2 + 0, data >> 0, mem_mask >> 0);
if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000))
if (ACCESSING_DWORD_1)
write32le_with_16be_handler(handler, param, offset * 2 + 1, data >> 32, mem_mask >> 32);
}
@ -446,9 +446,9 @@ INLINE void write64le_with_16be_handler(write16_machine_func handler, void *para
INLINE UINT64 read64be_with_32be_handler(read32_machine_func handler, void *param, offs_t offset, UINT64 mem_mask)
{
UINT64 result = 0;
if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000))
if (ACCESSING_DWORD_1)
result |= (UINT64)(*handler)(param, offset * 2 + 0, mem_mask >> 32) << 32;
if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff))
if (ACCESSING_DWORD_0)
result |= (UINT64)(*handler)(param, offset * 2 + 1, mem_mask >> 0) << 0;
return result;
}
@ -456,9 +456,9 @@ INLINE UINT64 read64be_with_32be_handler(read32_machine_func handler, void *para
INLINE void write64be_with_32be_handler(write32_machine_func handler, void *param, offs_t offset, UINT64 data, UINT64 mem_mask)
{
if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000))
if (ACCESSING_DWORD_1)
(*handler)(param, offset * 2 + 0, data >> 32, mem_mask >> 32);
if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff))
if (ACCESSING_DWORD_0)
(*handler)(param, offset * 2 + 1, data >> 0, mem_mask >> 0);
}
@ -472,9 +472,9 @@ INLINE void write64be_with_32be_handler(write32_machine_func handler, void *para
INLINE UINT64 read64le_with_32le_handler(read32_machine_func handler, void *param, offs_t offset, UINT64 mem_mask)
{
UINT64 result = 0;
if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff))
if (ACCESSING_DWORD_0)
result |= (UINT64)(*handler)(param, offset * 2 + 0, mem_mask >> 0) << 0;
if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000))
if (ACCESSING_DWORD_1)
result |= (UINT64)(*handler)(param, offset * 2 + 1, mem_mask >> 32) << 32;
return result;
}
@ -482,9 +482,9 @@ INLINE UINT64 read64le_with_32le_handler(read32_machine_func handler, void *para
INLINE void write64le_with_32le_handler(write32_machine_func handler, void *param, offs_t offset, UINT64 data, UINT64 mem_mask)
{
if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff))
if (ACCESSING_DWORD_0)
(*handler)(param, offset * 2 + 0, data >> 0, mem_mask >> 0);
if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000))
if (ACCESSING_DWORD_1)
(*handler)(param, offset * 2 + 1, data >> 32, mem_mask >> 32);
}
@ -617,11 +617,11 @@ WRITE8TO16LE(name,write8)
************************************/
#define READ8TO16BE_MSB( name, read8 ) \
READ_TEMPLATE_COND( 16, name, read8, read16be_with_read8_handler, ACCESSING_MSB )
READ_TEMPLATE_COND( 16, name, read8, read16be_with_read8_handler, ACCESSING_BYTE_1 )
#define WRITE8TO16BE_MSB( name, write8 ) \
WRITE_TEMPLATE_COND( 16, name, write8, write16be_with_write8_handler, ACCESSING_MSB )
WRITE_TEMPLATE_COND( 16, name, write8, write16be_with_write8_handler, ACCESSING_BYTE_1 )
#define READWRITE8TO16BE_MSB( name, read8, write8 ) \
@ -634,11 +634,11 @@ WRITE8TO16BE_MSB(name,write8)
************************************/
#define READ8TO16LE_MSB( name, read8 ) \
READ_TEMPLATE_COND( 16, name, read8, read16le_with_read8_handler, ACCESSING_MSB )
READ_TEMPLATE_COND( 16, name, read8, read16le_with_read8_handler, ACCESSING_BYTE_1 )
#define WRITE8TO16LE_MSB( name, write8 ) \
WRITE_TEMPLATE_COND( 16, name, write8, write16le_with_write8_handler, ACCESSING_MSB )
WRITE_TEMPLATE_COND( 16, name, write8, write16le_with_write8_handler, ACCESSING_BYTE_1 )
#define READWRITE8TO16LE_MSB( name, read8, write8 ) \
@ -651,11 +651,11 @@ WRITE8TO16LE_MSB(name,write8)
************************************/
#define READ8TO16BE_LSB( name, read8 ) \
READ_TEMPLATE_COND( 16, name, read8, read16be_with_read8_handler, ACCESSING_LSB )
READ_TEMPLATE_COND( 16, name, read8, read16be_with_read8_handler, ACCESSING_BYTE_0 )
#define WRITE8TO16BE_LSB( name, write8 ) \
WRITE_TEMPLATE_COND( 16, name, write8, write16be_with_write8_handler, ACCESSING_LSB )
WRITE_TEMPLATE_COND( 16, name, write8, write16be_with_write8_handler, ACCESSING_BYTE_0 )
#define READWRITE8TO16BE_LSB( name, read8, write8 ) \
@ -668,11 +668,11 @@ WRITE8TO16BE_LSB(name,write8)
************************************/
#define READ8TO16LE_LSB( name, read8 ) \
READ_TEMPLATE_COND( 16, name, read8, read16le_with_read8_handler, ACCESSING_LSB )
READ_TEMPLATE_COND( 16, name, read8, read16le_with_read8_handler, ACCESSING_BYTE_0 )
#define WRITE8TO16LE_LSB( name, write8 ) \
WRITE_TEMPLATE_COND( 16, name, write8, write16le_with_write8_handler, ACCESSING_LSB )
WRITE_TEMPLATE_COND( 16, name, write8, write16le_with_write8_handler, ACCESSING_BYTE_0 )
#define READWRITE8TO16LE_LSB( name, read8, write8 ) \
@ -719,11 +719,11 @@ WRITE8TO32LE(name,write8)
************************************/
#define READ8TO32BE_MSB( name, read8 ) \
READ_TEMPLATE_COND( 32, name, read8, read32be_with_read8_handler, ACCESSING_MSB32 )
READ_TEMPLATE_COND( 32, name, read8, read32be_with_read8_handler, ACCESSING_BYTE_3 )
#define WRITE8TO32BE_MSB( name, write8 ) \
WRITE_TEMPLATE_COND( 32, name, write8, write32be_with_write8_handler, ACCESSING_MSB32 )
WRITE_TEMPLATE_COND( 32, name, write8, write32be_with_write8_handler, ACCESSING_BYTE_3 )
#define READWRITE8TO32BE_MSB( name, read8, write8 ) \
@ -736,11 +736,11 @@ WRITE8TO32BE_MSB(name,write8)
************************************/
#define READ8TO32LE_MSB( name, read8 ) \
READ_TEMPLATE_COND( 32, name, read8, read32le_with_read8_handler, ACCESSING_MSB32 )
READ_TEMPLATE_COND( 32, name, read8, read32le_with_read8_handler, ACCESSING_BYTE_3 )
#define WRITE8TO32LE_MSB( name, write8 ) \
WRITE_TEMPLATE_COND( 32, name, write8, write32le_with_write8_handler, ACCESSING_MSB32 )
WRITE_TEMPLATE_COND( 32, name, write8, write32le_with_write8_handler, ACCESSING_BYTE_3 )
#define READWRITE8TO32LE_MSB( name, read8, write8 ) \
@ -753,11 +753,11 @@ WRITE8TO32LE_MSB(name,write8)
************************************/
#define READ8TO32BE_LSB( name, read8 ) \
READ_TEMPLATE_COND( 32, name, read8, read32be_with_read8_handler, ACCESSING_LSB32 )
READ_TEMPLATE_COND( 32, name, read8, read32be_with_read8_handler, ACCESSING_BYTE_0 )
#define WRITE8TO32BE_LSB( name, write8 ) \
WRITE_TEMPLATE_COND( 32, name, write8, write32be_with_write8_handler, ACCESSING_LSB32 )
WRITE_TEMPLATE_COND( 32, name, write8, write32be_with_write8_handler, ACCESSING_BYTE_0 )
#define READWRITE8TO32BE_LSB( name, read8, write8 ) \
@ -770,11 +770,11 @@ WRITE8TO32BE_LSB(name,write8)
************************************/
#define READ8TO32LE_LSB( name, read8 ) \
READ_TEMPLATE_COND( 32, name, read8, read32le_with_read8_handler, ACCESSING_LSB32 )
READ_TEMPLATE_COND( 32, name, read8, read32le_with_read8_handler, ACCESSING_BYTE_0 )
#define WRITE8TO32LE_LSB( name, write8 ) \
WRITE_TEMPLATE_COND( 32, name, write8, write32le_with_write8_handler, ACCESSING_LSB32 )
WRITE_TEMPLATE_COND( 32, name, write8, write32le_with_write8_handler, ACCESSING_BYTE_0 )
#define READWRITE8TO32LE_LSB( name, read8, write8 ) \
@ -889,11 +889,11 @@ WRITE16LETO32LE(name,write16)
*************************************/
#define READ16BETO32BE_MSW( name, read16 ) \
READ_TEMPLATE_COND( 32, name, read16, read32be_with_16be_handler, ACCESSING_MSW32 )
READ_TEMPLATE_COND( 32, name, read16, read32be_with_16be_handler, ACCESSING_WORD_1 )
#define WRITE16BETO32BE_MSW( name, write16 ) \
WRITE_TEMPLATE_COND( 32, name, write16, write32be_with_16be_handler, ACCESSING_MSW32 )
WRITE_TEMPLATE_COND( 32, name, write16, write32be_with_16be_handler, ACCESSING_WORD_1 )
#define READWRITE16BETO32BE_MSW( name, read16, write16 ) \
@ -906,11 +906,11 @@ WRITE16BETO32BE_MSW(name,write16)
*************************************/
#define READ16LETO32BE_MSW( name, read16 ) \
READ_TEMPLATE_COND( 32, name, read16, read32be_with_16le_handler, ACCESSING_MSW32 )
READ_TEMPLATE_COND( 32, name, read16, read32be_with_16le_handler, ACCESSING_WORD_1 )
#define WRITE16LETO32BE_MSW( name, write16 ) \
WRITE_TEMPLATE_COND( 32, name, write16, write32be_with_16le_handler, ACCESSING_MSW32 )
WRITE_TEMPLATE_COND( 32, name, write16, write32be_with_16le_handler, ACCESSING_WORD_1 )
#define READWRITE16LETO32BE_MSW( name, read16, write16 ) \
@ -923,11 +923,11 @@ WRITE16LETO32BE_MSW(name,write16)
*************************************/
#define READ16BETO32LE_MSW( name, read16 ) \
READ_TEMPLATE_COND( 32, name, read16, read32le_with_16be_handler, ACCESSING_MSW32 )
READ_TEMPLATE_COND( 32, name, read16, read32le_with_16be_handler, ACCESSING_WORD_1 )
#define WRITE16BETO32LE_MSW( name, write16 ) \
WRITE_TEMPLATE_COND( 32, name, write16, write32le_with_16be_handler, ACCESSING_MSW32 )
WRITE_TEMPLATE_COND( 32, name, write16, write32le_with_16be_handler, ACCESSING_WORD_1 )
#define READWRITE16BETO32LE_MSW( name, read16, write16 ) \
@ -940,11 +940,11 @@ WRITE16BETO32LE_MSW(name,write16)
*************************************/
#define READ16LETO32LE_MSW( name, read16 ) \
READ_TEMPLATE_COND( 32, name, read16, read32le_with_16le_handler, ACCESSING_MSW32 )
READ_TEMPLATE_COND( 32, name, read16, read32le_with_16le_handler, ACCESSING_WORD_1 )
#define WRITE16LETO32LE_MSW( name, write16 ) \
WRITE_TEMPLATE_COND( 32, name, write16, write32le_with_16le_handler, ACCESSING_MSW32 )
WRITE_TEMPLATE_COND( 32, name, write16, write32le_with_16le_handler, ACCESSING_WORD_1 )
#define READWRITE16LETO32LE_MSW( name, read16, write16 ) \
@ -956,11 +956,11 @@ WRITE16LETO32LE_MSW(name,write16)
*************************************/
#define READ16BETO32BE_LSW( name, read16 ) \
READ_TEMPLATE_COND( 32, name, read16, read32be_with_16be_handler, ACCESSING_LSW32 )
READ_TEMPLATE_COND( 32, name, read16, read32be_with_16be_handler, ACCESSING_WORD_0 )
#define WRITE16BETO32BE_LSW( name, write16 ) \
WRITE_TEMPLATE_COND( 32, name, write16, write32be_with_16be_handler, ACCESSING_LSW32 )
WRITE_TEMPLATE_COND( 32, name, write16, write32be_with_16be_handler, ACCESSING_WORD_0 )
#define READWRITE16BETO32BE_LSW( name, read16, write16 ) \
@ -973,11 +973,11 @@ WRITE16BETO32BE_LSW(name,write16)
*************************************/
#define READ16LETO32BE_LSW( name, read16 ) \
READ_TEMPLATE_COND( 32, name, read16, read32be_with_16le_handler, ACCESSING_LSW32 )
READ_TEMPLATE_COND( 32, name, read16, read32be_with_16le_handler, ACCESSING_WORD_0 )
#define WRITE16LETO32BE_LSW( name, write16 ) \
WRITE_TEMPLATE_COND( 32, name, write16, write32be_with_16le_handler, ACCESSING_LSW32 )
WRITE_TEMPLATE_COND( 32, name, write16, write32be_with_16le_handler, ACCESSING_WORD_0 )
#define READWRITE16LETO32BE_LSW( name, read16, write16 ) \
@ -990,11 +990,11 @@ WRITE16LETO32BE_LSW(name,write16)
*************************************/
#define READ16BETO32LE_LSW( name, read16 ) \
READ_TEMPLATE_COND( 32, name, read16, read32le_with_16be_handler, ACCESSING_LSW32 )
READ_TEMPLATE_COND( 32, name, read16, read32le_with_16be_handler, ACCESSING_WORD_0 )
#define WRITE16BETO32LE_LSW( name, write16 ) \
WRITE_TEMPLATE_COND( 32, name, write16, write32le_with_16be_handler, ACCESSING_LSW32 )
WRITE_TEMPLATE_COND( 32, name, write16, write32le_with_16be_handler, ACCESSING_WORD_0 )
#define READWRITE16BETO32LE_LSW( name, read16, write16 ) \
@ -1007,11 +1007,11 @@ WRITE16BETO32LE_LSW(name,write16)
*************************************/
#define READ16LETO32LE_LSW( name, read16 ) \
READ_TEMPLATE_COND( 32, name, read16, read32le_with_16le_handler, ACCESSING_LSW32 )
READ_TEMPLATE_COND( 32, name, read16, read32le_with_16le_handler, ACCESSING_WORD_0 )
#define WRITE16LETO32LE_LSW( name, write16 ) \
WRITE_TEMPLATE_COND( 32, name, write16, write32le_with_16le_handler, ACCESSING_LSW32 )
WRITE_TEMPLATE_COND( 32, name, write16, write32le_with_16le_handler, ACCESSING_WORD_0 )
#define READWRITE16LETO32LE_LSW( name, read16, write16 ) \

24
src/emu/memory.h
View File

@ -413,18 +413,22 @@ union _addrmap64_token
#define COMBINE_DATA(varptr) (*(varptr) = (*(varptr) & mem_mask) | (data & ~mem_mask))
/* 16-bit memory access tests */
#define ACCESSING_LSB16 ((mem_mask & 0x00ff) == 0)
#define ACCESSING_MSB16 ((mem_mask & 0xff00) == 0)
#define ACCESSING_LSB ACCESSING_LSB16
#define ACCESSING_MSB ACCESSING_MSB16
#define ACCESSING_BYTE_0 ((~mem_mask & 0x000000ff)!=0)
#define ACCESSING_BYTE_1 ((~mem_mask & 0x0000ff00)!=0)
#define ACCESSING_BYTE_2 ((~mem_mask & 0x00ff0000)!=0)
#define ACCESSING_BYTE_3 ((~mem_mask & 0xff000000)!=0)
#define ACCESSING_BYTE_4 ((~mem_mask & U64(0x000000ff00000000))!=0)
#define ACCESSING_BYTE_5 ((~mem_mask & U64(0x0000ff0000000000))!=0)
#define ACCESSING_BYTE_6 ((~mem_mask & U64(0x00ff000000000000))!=0)
#define ACCESSING_BYTE_7 ((~mem_mask & U64(0xff00000000000000))!=0)
#define ACCESSING_WORD_0 ((~mem_mask & 0x0000ffff)!=0)
#define ACCESSING_WORD_1 ((~mem_mask & 0xffff0000)!=0)
#define ACCESSING_WORD_2 ((~mem_mask & U64(0x0000ffff00000000))!=0)
#define ACCESSING_WORD_3 ((~mem_mask & U64(0xffff000000000000))!=0)
/* 32-bit memory access tests */
#define ACCESSING_LSW32 ((mem_mask & 0x0000ffff) == 0)
#define ACCESSING_MSW32 ((mem_mask & 0xffff0000) == 0)
#define ACCESSING_LSB32 ((mem_mask & 0x000000ff) == 0)
#define ACCESSING_MSB32 ((mem_mask & 0xff000000) == 0)
#define ACCESSING_DWORD_0 ((~mem_mask & 0xffffffff)!=0)
#define ACCESSING_DWORD_1 ((~mem_mask & U64(0xffffffff00000000))!=0)
/* bank switching for CPU cores */

12
src/emu/sound/2151intf.c
View File

@ -166,37 +166,37 @@ READ16_HANDLER( YM2151_status_port_2_lsb_r )
WRITE16_HANDLER( YM2151_register_port_0_lsb_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
YM2151_register_port_0_w(machine, 0, data & 0xff);
}
WRITE16_HANDLER( YM2151_register_port_1_lsb_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
YM2151_register_port_1_w(machine, 0, data & 0xff);
}
WRITE16_HANDLER( YM2151_register_port_2_lsb_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
YM2151_register_port_2_w(machine, 0, data & 0xff);
}
WRITE16_HANDLER( YM2151_data_port_0_lsb_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
YM2151_data_port_0_w(machine, 0, data & 0xff);
}
WRITE16_HANDLER( YM2151_data_port_1_lsb_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
YM2151_data_port_1_w(machine, 0, data & 0xff);
}
WRITE16_HANDLER( YM2151_data_port_2_lsb_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
YM2151_data_port_2_w(machine, 0, data & 0xff);
}

20
src/emu/sound/2203intf.c
View File

@ -233,62 +233,62 @@ READ16_HANDLER( YM2203_read_port_4_lsb_r ) { struct ym2203_info *info = sndti_to
WRITE16_HANDLER( YM2203_control_port_0_lsb_w )
{
struct ym2203_info *info = sndti_token(SOUND_YM2203, 0);
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
YM2203Write(info->chip,0,data);
}
WRITE16_HANDLER( YM2203_control_port_1_lsb_w )
{
struct ym2203_info *info = sndti_token(SOUND_YM2203, 1);
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
YM2203Write(info->chip,0,data);
}
WRITE16_HANDLER( YM2203_control_port_2_lsb_w )
{
struct ym2203_info *info = sndti_token(SOUND_YM2203, 2);
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
YM2203Write(info->chip,0,data);
}
WRITE16_HANDLER( YM2203_control_port_3_lsb_w )
{
struct ym2203_info *info = sndti_token(SOUND_YM2203, 3);
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
YM2203Write(info->chip,0,data);
}
WRITE16_HANDLER( YM2203_control_port_4_lsb_w )
{
struct ym2203_info *info = sndti_token(SOUND_YM2203, 4);
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
YM2203Write(info->chip,0,data);
}
WRITE16_HANDLER( YM2203_write_port_0_lsb_w )
{
struct ym2203_info *info = sndti_token(SOUND_YM2203, 0);
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
YM2203Write(info->chip,1,data);
}
WRITE16_HANDLER( YM2203_write_port_1_lsb_w )
{
struct ym2203_info *info = sndti_token(SOUND_YM2203, 1);
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
YM2203Write(info->chip,1,data);
}
WRITE16_HANDLER( YM2203_write_port_2_lsb_w )
{
struct ym2203_info *info = sndti_token(SOUND_YM2203, 2);
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
YM2203Write(info->chip,1,data);
}
WRITE16_HANDLER( YM2203_write_port_3_lsb_w )
{
struct ym2203_info *info = sndti_token(SOUND_YM2203, 3);
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
YM2203Write(info->chip,1,data);
}
WRITE16_HANDLER( YM2203_write_port_4_lsb_w )
{
struct ym2203_info *info = sndti_token(SOUND_YM2203, 4);
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
YM2203Write(info->chip,1,data);
}

20
src/emu/sound/2413intf.c
View File

@ -139,16 +139,16 @@ WRITE8_HANDLER( YM2413_data_port_1_w ) { struct ym2413_info *info = sndti_token(
WRITE8_HANDLER( YM2413_data_port_2_w ) { struct ym2413_info *info = sndti_token(SOUND_YM2413, 2); YM2413Write (info->chip, 1, data); } /* 3rd chip */
WRITE8_HANDLER( YM2413_data_port_3_w ) { struct ym2413_info *info = sndti_token(SOUND_YM2413, 3); YM2413Write (info->chip, 1, data); } /* 4th chip */
WRITE16_HANDLER( YM2413_register_port_0_lsb_w ) { if (ACCESSING_LSB) YM2413_register_port_0_w(machine,offset,data & 0xff); }
WRITE16_HANDLER( YM2413_register_port_0_msb_w ) { if (ACCESSING_MSB) YM2413_register_port_0_w(machine,offset,((data & 0xff00) >> 8)); }
WRITE16_HANDLER( YM2413_register_port_1_lsb_w ) { if (ACCESSING_LSB) YM2413_register_port_1_w(machine,offset,data & 0xff); }
WRITE16_HANDLER( YM2413_register_port_2_lsb_w ) { if (ACCESSING_LSB) YM2413_register_port_2_w(machine,offset,data & 0xff); }
WRITE16_HANDLER( YM2413_register_port_3_lsb_w ) { if (ACCESSING_LSB) YM2413_register_port_3_w(machine,offset,data & 0xff); }
WRITE16_HANDLER( YM2413_data_port_0_lsb_w ) { if (ACCESSING_LSB) YM2413_data_port_0_w(machine,offset,data & 0xff); }
WRITE16_HANDLER( YM2413_data_port_0_msb_w ) { if (ACCESSING_MSB) YM2413_data_port_0_w(machine,offset,((data & 0xff00) >> 8)); }
WRITE16_HANDLER( YM2413_data_port_1_lsb_w ) { if (ACCESSING_LSB) YM2413_data_port_1_w(machine,offset,data & 0xff); }
WRITE16_HANDLER( YM2413_data_port_2_lsb_w ) { if (ACCESSING_LSB) YM2413_data_port_2_w(machine,offset,data & 0xff); }
WRITE16_HANDLER( YM2413_data_port_3_lsb_w ) { if (ACCESSING_LSB) YM2413_data_port_3_w(machine,offset,data & 0xff); }
WRITE16_HANDLER( YM2413_register_port_0_lsb_w ) { if (ACCESSING_BYTE_0) YM2413_register_port_0_w(machine,offset,data & 0xff); }
WRITE16_HANDLER( YM2413_register_port_0_msb_w ) { if (ACCESSING_BYTE_1) YM2413_register_port_0_w(machine,offset,((data & 0xff00) >> 8)); }
WRITE16_HANDLER( YM2413_register_port_1_lsb_w ) { if (ACCESSING_BYTE_0) YM2413_register_port_1_w(machine,offset,data & 0xff); }
WRITE16_HANDLER( YM2413_register_port_2_lsb_w ) { if (ACCESSING_BYTE_0) YM2413_register_port_2_w(machine,offset,data & 0xff); }
WRITE16_HANDLER( YM2413_register_port_3_lsb_w ) { if (ACCESSING_BYTE_0) YM2413_register_port_3_w(machine,offset,data & 0xff); }
WRITE16_HANDLER( YM2413_data_port_0_lsb_w ) { if (ACCESSING_BYTE_0) YM2413_data_port_0_w(machine,offset,data & 0xff); }
WRITE16_HANDLER( YM2413_data_port_0_msb_w ) { if (ACCESSING_BYTE_1) YM2413_data_port_0_w(machine,offset,((data & 0xff00) >> 8)); }
WRITE16_HANDLER( YM2413_data_port_1_lsb_w ) { if (ACCESSING_BYTE_0) YM2413_data_port_1_w(machine,offset,data & 0xff); }
WRITE16_HANDLER( YM2413_data_port_2_lsb_w ) { if (ACCESSING_BYTE_0) YM2413_data_port_2_w(machine,offset,data & 0xff); }
WRITE16_HANDLER( YM2413_data_port_3_lsb_w ) { if (ACCESSING_BYTE_0) YM2413_data_port_3_w(machine,offset,data & 0xff); }
/**************************************************************************

16
src/emu/sound/2610intf.c
View File

@ -320,7 +320,7 @@ WRITE8_HANDLER( YM2610_control_port_0_A_w )
WRITE16_HANDLER( YM2610_control_port_0_A_lsb_w )
{
//logerror("PC %04x: 2610 Reg A %02X",activecpu_get_pc(),data);
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
struct ym2610_info *info = sndti_token(chip_type,0);
YM2610Write(info->chip,0,data);
@ -337,7 +337,7 @@ WRITE8_HANDLER( YM2610_control_port_0_B_w )
WRITE16_HANDLER( YM2610_control_port_0_B_lsb_w )
{
//logerror("PC %04x: 2610 Reg B %02X",activecpu_get_pc(),data);
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
struct ym2610_info *info = sndti_token(chip_type,0);
YM2610Write(info->chip,2,data);
@ -354,7 +354,7 @@ WRITE8_HANDLER( YM2610_control_port_1_A_w ){
}
WRITE16_HANDLER( YM2610_control_port_1_A_lsb_w ){
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
struct ym2610_info *info = sndti_token(chip_type,1);
YM2610Write(info->chip,0,data);
@ -367,7 +367,7 @@ WRITE8_HANDLER( YM2610_control_port_1_B_w ){
}
WRITE16_HANDLER( YM2610_control_port_1_B_lsb_w ){
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
struct ym2610_info *info = sndti_token(chip_type,1);
YM2610Write(info->chip,2,data);
@ -388,7 +388,7 @@ WRITE8_HANDLER( YM2610_data_port_0_A_w )
WRITE16_HANDLER( YM2610_data_port_0_A_lsb_w )
{
//logerror(" =%02X\n",data);
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
struct ym2610_info *info = sndti_token(chip_type,0);
YM2610Write(info->chip,1,data);
@ -405,7 +405,7 @@ WRITE8_HANDLER( YM2610_data_port_0_B_w )
WRITE16_HANDLER( YM2610_data_port_0_B_lsb_w )
{
//logerror(" =%02X\n",data);
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
struct ym2610_info *info = sndti_token(chip_type,0);
YM2610Write(info->chip,3,data);
@ -422,7 +422,7 @@ WRITE8_HANDLER( YM2610_data_port_1_A_w ){
}
WRITE16_HANDLER( YM2610_data_port_1_A_lsb_w ){
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
struct ym2610_info *info = sndti_token(chip_type,1);
YM2610Write(info->chip,1,data);
@ -435,7 +435,7 @@ WRITE8_HANDLER( YM2610_data_port_1_B_w ){
}
WRITE16_HANDLER( YM2610_data_port_1_B_lsb_w ){
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
struct ym2610_info *info = sndti_token(chip_type,1);
YM2610Write(info->chip,3,data);

40
src/emu/sound/ay8910.c
View File

@ -262,32 +262,32 @@ WRITE8_HANDLER( AY8910_control_port_1_w ) { ay8910_write_ym(sndti_token(SOUND_AY
WRITE8_HANDLER( AY8910_control_port_2_w ) { ay8910_write_ym(sndti_token(SOUND_AY8910, 2),0,data); }
WRITE8_HANDLER( AY8910_control_port_3_w ) { ay8910_write_ym(sndti_token(SOUND_AY8910, 3),0,data); }
WRITE8_HANDLER( AY8910_control_port_4_w ) { ay8910_write_ym(sndti_token(SOUND_AY8910, 4),0,data); }
WRITE16_HANDLER( AY8910_control_port_0_lsb_w ) { if (ACCESSING_LSB) ay8910_write_ym(sndti_token(SOUND_AY8910, 0),0,data & 0xff); }
WRITE16_HANDLER( AY8910_control_port_1_lsb_w ) { if (ACCESSING_LSB) ay8910_write_ym(sndti_token(SOUND_AY8910, 1),0,data & 0xff); }
WRITE16_HANDLER( AY8910_control_port_2_lsb_w ) { if (ACCESSING_LSB) ay8910_write_ym(sndti_token(SOUND_AY8910, 2),0,data & 0xff); }
WRITE16_HANDLER( AY8910_control_port_3_lsb_w ) { if (ACCESSING_LSB) ay8910_write_ym(sndti_token(SOUND_AY8910, 3),0,data & 0xff); }
WRITE16_HANDLER( AY8910_control_port_4_lsb_w ) { if (ACCESSING_LSB) ay8910_write_ym(sndti_token(SOUND_AY8910, 4),0,data & 0xff); }
WRITE16_HANDLER( AY8910_control_port_0_msb_w ) { if (ACCESSING_MSB) ay8910_write_ym(sndti_token(SOUND_AY8910, 0),0,data >> 8); }
WRITE16_HANDLER( AY8910_control_port_1_msb_w ) { if (ACCESSING_MSB) ay8910_write_ym(sndti_token(SOUND_AY8910, 1),0,data >> 8); }
WRITE16_HANDLER( AY8910_control_port_2_msb_w ) { if (ACCESSING_MSB) ay8910_write_ym(sndti_token(SOUND_AY8910, 2),0,data >> 8); }
WRITE16_HANDLER( AY8910_control_port_3_msb_w ) { if (ACCESSING_MSB) ay8910_write_ym(sndti_token(SOUND_AY8910, 3),0,data >> 8); }
WRITE16_HANDLER( AY8910_control_port_4_msb_w ) { if (ACCESSING_MSB) ay8910_write_ym(sndti_token(SOUND_AY8910, 4),0,data >> 8); }
WRITE16_HANDLER( AY8910_control_port_0_lsb_w ) { if (ACCESSING_BYTE_0) ay8910_write_ym(sndti_token(SOUND_AY8910, 0),0,data & 0xff); }
WRITE16_HANDLER( AY8910_control_port_1_lsb_w ) { if (ACCESSING_BYTE_0) ay8910_write_ym(sndti_token(SOUND_AY8910, 1),0,data & 0xff); }
WRITE16_HANDLER( AY8910_control_port_2_lsb_w ) { if (ACCESSING_BYTE_0) ay8910_write_ym(sndti_token(SOUND_AY8910, 2),0,data & 0xff); }
WRITE16_HANDLER( AY8910_control_port_3_lsb_w ) { if (ACCESSING_BYTE_0) ay8910_write_ym(sndti_token(SOUND_AY8910, 3),0,data & 0xff); }
WRITE16_HANDLER( AY8910_control_port_4_lsb_w ) { if (ACCESSING_BYTE_0) ay8910_write_ym(sndti_token(SOUND_AY8910, 4),0,data & 0xff); }
WRITE16_HANDLER( AY8910_control_port_0_msb_w ) { if (ACCESSING_BYTE_1) ay8910_write_ym(sndti_token(SOUND_AY8910, 0),0,data >> 8); }
WRITE16_HANDLER( AY8910_control_port_1_msb_w ) { if (ACCESSING_BYTE_1) ay8910_write_ym(sndti_token(SOUND_AY8910, 1),0,data >> 8); }
WRITE16_HANDLER( AY8910_control_port_2_msb_w ) { if (ACCESSING_BYTE_1) ay8910_write_ym(sndti_token(SOUND_AY8910, 2),0,data >> 8); }
WRITE16_HANDLER( AY8910_control_port_3_msb_w ) { if (ACCESSING_BYTE_1) ay8910_write_ym(sndti_token(SOUND_AY8910, 3),0,data >> 8); }
WRITE16_HANDLER( AY8910_control_port_4_msb_w ) { if (ACCESSING_BYTE_1) ay8910_write_ym(sndti_token(SOUND_AY8910, 4),0,data >> 8); }
WRITE8_HANDLER( AY8910_write_port_0_w ) { ay8910_write_ym(sndti_token(SOUND_AY8910, 0),1,data); }
WRITE8_HANDLER( AY8910_write_port_1_w ) { ay8910_write_ym(sndti_token(SOUND_AY8910, 1),1,data); }
WRITE8_HANDLER( AY8910_write_port_2_w ) { ay8910_write_ym(sndti_token(SOUND_AY8910, 2),1,data); }
WRITE8_HANDLER( AY8910_write_port_3_w ) { ay8910_write_ym(sndti_token(SOUND_AY8910, 3),1,data); }
WRITE8_HANDLER( AY8910_write_port_4_w ) { ay8910_write_ym(sndti_token(SOUND_AY8910, 4),1,data); }
WRITE16_HANDLER( AY8910_write_port_0_lsb_w ) { if (ACCESSING_LSB) ay8910_write_ym(sndti_token(SOUND_AY8910, 0),1,data & 0xff); }
WRITE16_HANDLER( AY8910_write_port_1_lsb_w ) { if (ACCESSING_LSB) ay8910_write_ym(sndti_token(SOUND_AY8910, 1),1,data & 0xff); }
WRITE16_HANDLER( AY8910_write_port_2_lsb_w ) { if (ACCESSING_LSB) ay8910_write_ym(sndti_token(SOUND_AY8910, 2),1,data & 0xff); }
WRITE16_HANDLER( AY8910_write_port_3_lsb_w ) { if (ACCESSING_LSB) ay8910_write_ym(sndti_token(SOUND_AY8910, 3),1,data & 0xff); }
WRITE16_HANDLER( AY8910_write_port_4_lsb_w ) { if (ACCESSING_LSB) ay8910_write_ym(sndti_token(SOUND_AY8910, 4),1,data & 0xff); }
WRITE16_HANDLER( AY8910_write_port_0_msb_w ) { if (ACCESSING_MSB) ay8910_write_ym(sndti_token(SOUND_AY8910, 0),1,data >> 8); }
WRITE16_HANDLER( AY8910_write_port_1_msb_w ) { if (ACCESSING_MSB) ay8910_write_ym(sndti_token(SOUND_AY8910, 1),1,data >> 8); }
WRITE16_HANDLER( AY8910_write_port_2_msb_w ) { if (ACCESSING_MSB) ay8910_write_ym(sndti_token(SOUND_AY8910, 2),1,data >> 8); }
WRITE16_HANDLER( AY8910_write_port_3_msb_w ) { if (ACCESSING_MSB) ay8910_write_ym(sndti_token(SOUND_AY8910, 3),1,data >> 8); }
WRITE16_HANDLER( AY8910_write_port_4_msb_w ) { if (ACCESSING_MSB) ay8910_write_ym(sndti_token(SOUND_AY8910, 4),1,data >> 8); }
WRITE16_HANDLER( AY8910_write_port_0_lsb_w ) { if (ACCESSING_BYTE_0) ay8910_write_ym(sndti_token(SOUND_AY8910, 0),1,data & 0xff); }
WRITE16_HANDLER( AY8910_write_port_1_lsb_w ) { if (ACCESSING_BYTE_0) ay8910_write_ym(sndti_token(SOUND_AY8910, 1),1,data & 0xff); }
WRITE16_HANDLER( AY8910_write_port_2_lsb_w ) { if (ACCESSING_BYTE_0) ay8910_write_ym(sndti_token(SOUND_AY8910, 2),1,data & 0xff); }
WRITE16_HANDLER( AY8910_write_port_3_lsb_w ) { if (ACCESSING_BYTE_0) ay8910_write_ym(sndti_token(SOUND_AY8910, 3),1,data & 0xff); }
WRITE16_HANDLER( AY8910_write_port_4_lsb_w ) { if (ACCESSING_BYTE_0) ay8910_write_ym(sndti_token(SOUND_AY8910, 4),1,data & 0xff); }
WRITE16_HANDLER( AY8910_write_port_0_msb_w ) { if (ACCESSING_BYTE_1) ay8910_write_ym(sndti_token(SOUND_AY8910, 0),1,data >> 8); }
WRITE16_HANDLER( AY8910_write_port_1_msb_w ) { if (ACCESSING_BYTE_1) ay8910_write_ym(sndti_token(SOUND_AY8910, 1),1,data >> 8); }
WRITE16_HANDLER( AY8910_write_port_2_msb_w ) { if (ACCESSING_BYTE_1) ay8910_write_ym(sndti_token(SOUND_AY8910, 2),1,data >> 8); }
WRITE16_HANDLER( AY8910_write_port_3_msb_w ) { if (ACCESSING_BYTE_1) ay8910_write_ym(sndti_token(SOUND_AY8910, 3),1,data >> 8); }
WRITE16_HANDLER( AY8910_write_port_4_msb_w ) { if (ACCESSING_BYTE_1) ay8910_write_ym(sndti_token(SOUND_AY8910, 4),1,data >> 8); }

88
src/emu/sound/es5506.c
View File

@ -1467,13 +1467,13 @@ WRITE8_HANDLER( ES5506_data_1_w )
WRITE16_HANDLER( ES5506_data_0_word_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
es5506_reg_write(sndti_token(SOUND_ES5506, 0), offset, data);
}
WRITE16_HANDLER( ES5506_data_1_word_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
es5506_reg_write(sndti_token(SOUND_ES5506, 1), offset, data);
}
@ -1545,7 +1545,7 @@ INLINE void es5505_reg_write_low(struct ES5506Chip *chip, struct ES5506Voice *vo
switch (offset)
{
case 0x00: /* CR */
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
#if RAINE_CHECK
voice->control &= ~(CONTROL_STOPMASK | CONTROL_LOOPMASK | CONTROL_DIR);
@ -1555,7 +1555,7 @@ INLINE void es5505_reg_write_low(struct ES5506Chip *chip, struct ES5506Voice *vo
voice->control |= (data & (CONTROL_STOPMASK | CONTROL_LOOPMASK | CONTROL_IRQE | CONTROL_DIR | CONTROL_IRQ)) |
((data << 12) & CONTROL_BS0);
}
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
{
voice->control &= ~(CONTROL_CA0 | CONTROL_CA1 | CONTROL_LPMASK);
voice->control |= ((data >> 2) & CONTROL_LPMASK) |
@ -1567,36 +1567,36 @@ INLINE void es5505_reg_write_low(struct ES5506Chip *chip, struct ES5506Voice *vo
break;
case 0x01: /* FC */
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
voice->freqcount = (voice->freqcount & ~0x001fe) | ((data & 0x00ff) << 1);
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
voice->freqcount = (voice->freqcount & ~0x1fe00) | ((data & 0xff00) << 1);
if (LOG_COMMANDS && eslog)
fprintf(eslog, "%06x:voice %d, freq count=%08x\n", activecpu_get_previouspc(), chip->current_page & 0x1f, voice->freqcount);
break;
case 0x02: /* STRT (hi) */
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
voice->start = (voice->start & ~0x03fc0000) | ((data & 0x00ff) << 18);
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
voice->start = (voice->start & ~0x7c000000) | ((data & 0x1f00) << 18);
if (LOG_COMMANDS && eslog)
fprintf(eslog, "%06x:voice %d, loop start=%08x\n", activecpu_get_previouspc(), chip->current_page & 0x1f, voice->start);
break;
case 0x03: /* STRT (lo) */
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
voice->start = (voice->start & ~0x00000380) | ((data & 0x00e0) << 2);
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
voice->start = (voice->start & ~0x0003fc00) | ((data & 0xff00) << 2);
if (LOG_COMMANDS && eslog)
fprintf(eslog, "%06x:voice %d, loop start=%08x\n", activecpu_get_previouspc(), chip->current_page & 0x1f, voice->start);
break;
case 0x04: /* END (hi) */
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
voice->end = (voice->end & ~0x03fc0000) | ((data & 0x00ff) << 18);
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
voice->end = (voice->end & ~0x7c000000) | ((data & 0x1f00) << 18);
#if RAINE_CHECK
voice->control |= CONTROL_STOP0;
@ -1606,9 +1606,9 @@ INLINE void es5505_reg_write_low(struct ES5506Chip *chip, struct ES5506Voice *vo
break;
case 0x05: /* END (lo) */
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
voice->end = (voice->end & ~0x00000380) | ((data & 0x00e0) << 2);
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
voice->end = (voice->end & ~0x0003fc00) | ((data & 0xff00) << 2);
#if RAINE_CHECK
voice->control |= CONTROL_STOP0;
@ -1618,50 +1618,50 @@ INLINE void es5505_reg_write_low(struct ES5506Chip *chip, struct ES5506Voice *vo
break;
case 0x06: /* K2 */
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
voice->k2 = (voice->k2 & ~0x00f0) | (data & 0x00f0);
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
voice->k2 = (voice->k2 & ~0xff00) | (data & 0xff00);
if (LOG_COMMANDS && eslog)
fprintf(eslog, "%06x:voice %d, K2=%04x\n", activecpu_get_previouspc(), chip->current_page & 0x1f, voice->k2);
break;
case 0x07: /* K1 */
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
voice->k1 = (voice->k1 & ~0x00f0) | (data & 0x00f0);
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
voice->k1 = (voice->k1 & ~0xff00) | (data & 0xff00);
if (LOG_COMMANDS && eslog)
fprintf(eslog, "%06x:voice %d, K1=%04x\n", activecpu_get_previouspc(), chip->current_page & 0x1f, voice->k1);
break;
case 0x08: /* LVOL */
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
voice->lvol = (voice->lvol & ~0xff00) | (data & 0xff00);
if (LOG_COMMANDS && eslog)
fprintf(eslog, "%06x:voice %d, left vol=%04x\n", activecpu_get_previouspc(), chip->current_page & 0x1f, voice->lvol);
break;
case 0x09: /* RVOL */
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
voice->rvol = (voice->rvol & ~0xff00) | (data & 0xff00);
if (LOG_COMMANDS && eslog)
fprintf(eslog, "%06x:voice %d, right vol=%04x\n", activecpu_get_previouspc(), chip->current_page & 0x1f, voice->rvol);
break;
case 0x0a: /* ACC (hi) */
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
voice->accum = (voice->accum & ~0x03fc0000) | ((data & 0x00ff) << 18);
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
voice->accum = (voice->accum & ~0x7c000000) | ((data & 0x1f00) << 18);
if (LOG_COMMANDS && eslog)
fprintf(eslog, "%06x:voice %d, accum=%08x\n", activecpu_get_previouspc(), chip->current_page & 0x1f, voice->accum);
break;
case 0x0b: /* ACC (lo) */
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
voice->accum = (voice->accum & ~0x000003fc) | ((data & 0x00ff) << 2);
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
voice->accum = (voice->accum & ~0x0003fc00) | ((data & 0xff00) << 2);
if (LOG_COMMANDS && eslog)
fprintf(eslog, "%06x:voice %d, accum=%08x\n", activecpu_get_previouspc(), chip->current_page & 0x1f, voice->accum);
@ -1671,7 +1671,7 @@ INLINE void es5505_reg_write_low(struct ES5506Chip *chip, struct ES5506Voice *vo
break;
case 0x0d: /* ACT */
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
chip->active_voices = data & 0x1f;
chip->sample_rate = chip->master_clock / (16 * (chip->active_voices + 1));
@ -1686,7 +1686,7 @@ INLINE void es5505_reg_write_low(struct ES5506Chip *chip, struct ES5506Voice *vo
break;
case 0x0f: /* PAGE */
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
chip->current_page = data & 0x7f;
break;
}
@ -1698,13 +1698,13 @@ INLINE void es5505_reg_write_high(struct ES5506Chip *chip, struct ES5506Voice *v
switch (offset)
{
case 0x00: /* CR */
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
voice->control &= ~(CONTROL_STOPMASK | CONTROL_BS0 | CONTROL_LOOPMASK | CONTROL_IRQE | CONTROL_DIR | CONTROL_IRQ);
voice->control |= (data & (CONTROL_STOPMASK | CONTROL_LOOPMASK | CONTROL_IRQE | CONTROL_DIR | CONTROL_IRQ)) |
((data << 12) & CONTROL_BS0);
}
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
{
voice->control &= ~(CONTROL_CA0 | CONTROL_CA1 | CONTROL_LPMASK);
voice->control |= ((data >> 2) & CONTROL_LPMASK) |
@ -1715,54 +1715,54 @@ INLINE void es5505_reg_write_high(struct ES5506Chip *chip, struct ES5506Voice *v
break;
case 0x01: /* O4(n-1) */
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
voice->o4n1 = (voice->o4n1 & ~0x00ff) | (data & 0x00ff);
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
voice->o4n1 = (INT16)((voice->o4n1 & ~0xff00) | (data & 0xff00));
if (LOG_COMMANDS && eslog)
fprintf(eslog, "%06x:voice %d, O4(n-1)=%05x\n", activecpu_get_previouspc(), chip->current_page & 0x1f, voice->o4n1 & 0x3ffff);
break;
case 0x02: /* O3(n-1) */
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
voice->o3n1 = (voice->o3n1 & ~0x00ff) | (data & 0x00ff);
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
voice->o3n1 = (INT16)((voice->o3n1 & ~0xff00) | (data & 0xff00));
if (LOG_COMMANDS && eslog)
fprintf(eslog, "%06x:voice %d, O3(n-1)=%05x\n", activecpu_get_previouspc(), chip->current_page & 0x1f, voice->o3n1 & 0x3ffff);
break;
case 0x03: /* O3(n-2) */
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
voice->o3n2 = (voice->o3n2 & ~0x00ff) | (data & 0x00ff);
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
voice->o3n2 = (INT16)((voice->o3n2 & ~0xff00) | (data & 0xff00));
if (LOG_COMMANDS && eslog)
fprintf(eslog, "%06x:voice %d, O3(n-2)=%05x\n", activecpu_get_previouspc(), chip->current_page & 0x1f, voice->o3n2 & 0x3ffff);
break;
case 0x04: /* O2(n-1) */
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
voice->o2n1 = (voice->o2n1 & ~0x00ff) | (data & 0x00ff);
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
voice->o2n1 = (INT16)((voice->o2n1 & ~0xff00) | (data & 0xff00));
if (LOG_COMMANDS && eslog)
fprintf(eslog, "%06x:voice %d, O2(n-1)=%05x\n", activecpu_get_previouspc(), chip->current_page & 0x1f, voice->o2n1 & 0x3ffff);
break;
case 0x05: /* O2(n-2) */
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
voice->o2n2 = (voice->o2n2 & ~0x00ff) | (data & 0x00ff);
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
voice->o2n2 = (INT16)((voice->o2n2 & ~0xff00) | (data & 0xff00));
if (LOG_COMMANDS && eslog)
fprintf(eslog, "%06x:voice %d, O2(n-2)=%05x\n", activecpu_get_previouspc(), chip->current_page & 0x1f, voice->o2n2 & 0x3ffff);
break;
case 0x06: /* O1(n-1) */
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
voice->o1n1 = (voice->o1n1 & ~0x00ff) | (data & 0x00ff);
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
voice->o1n1 = (INT16)((voice->o1n1 & ~0xff00) | (data & 0xff00));
if (LOG_COMMANDS && eslog)
fprintf(eslog, "%06x:voice %d, O1(n-1)=%05x (accum=%08x)\n", activecpu_get_previouspc(), chip->current_page & 0x1f, voice->o2n1 & 0x3ffff, voice->accum);
@ -1777,7 +1777,7 @@ INLINE void es5505_reg_write_high(struct ES5506Chip *chip, struct ES5506Voice *v
break;
case 0x0d: /* ACT */
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
chip->active_voices = data & 0x1f;
chip->sample_rate = chip->master_clock / (16 * (chip->active_voices + 1));
@ -1792,7 +1792,7 @@ INLINE void es5505_reg_write_high(struct ES5506Chip *chip, struct ES5506Voice *v
break;
case 0x0f: /* PAGE */
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
chip->current_page = data & 0x7f;
break;
}
@ -1821,7 +1821,7 @@ INLINE void es5505_reg_write_test(struct ES5506Chip *chip, struct ES5506Voice *v
break;
case 0x0d: /* ACT */
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
chip->active_voices = data & 0x1f;
chip->sample_rate = chip->master_clock / (16 * (chip->active_voices + 1));
@ -1836,7 +1836,7 @@ INLINE void es5505_reg_write_test(struct ES5506Chip *chip, struct ES5506Voice *v
break;
case 0x0f: /* PAGE */
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
chip->current_page = data & 0x7f;
break;
}

12
src/emu/sound/es8712.c
View File

@ -407,37 +407,37 @@ WRITE8_HANDLER( ES8712_data_2_w )
WRITE16_HANDLER( ES8712_data_0_lsb_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
ES8712_data_w(0, offset, data & 0xff);
}
WRITE16_HANDLER( ES8712_data_1_lsb_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
ES8712_data_w(1, offset, data & 0xff);
}
WRITE16_HANDLER( ES8712_data_2_lsb_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
ES8712_data_w(2, offset, data & 0xff);
}
WRITE16_HANDLER( ES8712_data_0_msb_w )
{
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
ES8712_data_w(0, offset, data >> 8);
}
WRITE16_HANDLER( ES8712_data_1_msb_w )
{
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
ES8712_data_w(1, offset, data >> 8);
}
WRITE16_HANDLER( ES8712_data_2_msb_w )
{
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
ES8712_data_w(2, offset, data >> 8);
}

2
src/emu/sound/iremga20.c
View File

@ -138,7 +138,7 @@ WRITE16_HANDLER( IremGA20_w )
int channel;
/* only low byte hooked up? */
if (!ACCESSING_LSB)
if (!ACCESSING_BYTE_0)
return;
//logerror("GA20: Offset %02x, data %04x\n",offset,data);

4
src/emu/sound/k053260.c
View File

@ -428,7 +428,7 @@ WRITE8_HANDLER( K053260_1_w )
WRITE16_HANDLER( K053260_0_lsb_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
K053260_0_w (machine, offset, data & 0xff);
}
@ -439,7 +439,7 @@ READ16_HANDLER( K053260_0_lsb_r )
WRITE16_HANDLER( K053260_1_lsb_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
K053260_1_w (machine, offset, data & 0xff);
}

12
src/emu/sound/okim6295.c
View File

@ -604,37 +604,37 @@ WRITE8_HANDLER( OKIM6295_data_2_w )
WRITE16_HANDLER( OKIM6295_data_0_lsb_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
OKIM6295_data_w(0, data & 0xff);
}
WRITE16_HANDLER( OKIM6295_data_1_lsb_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
OKIM6295_data_w(1, data & 0xff);
}
WRITE16_HANDLER( OKIM6295_data_2_lsb_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
OKIM6295_data_w(2, data & 0xff);
}
WRITE16_HANDLER( OKIM6295_data_0_msb_w )
{
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
OKIM6295_data_w(0, data >> 8);
}
WRITE16_HANDLER( OKIM6295_data_1_msb_w )
{
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
OKIM6295_data_w(1, data >> 8);
}
WRITE16_HANDLER( OKIM6295_data_2_msb_w )
{
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
OKIM6295_data_w(2, data >> 8);
}

52
src/emu/sound/psx.c
View File

@ -377,21 +377,21 @@ READ32_HANDLER( psx_spu_r )
switch( offset % 4 )
{
case SPU_CHANNEL_REG( 0x8 ):
if( ACCESSING_LSW32 )
if( ACCESSING_WORD_0 )
{
verboselog( 1, "psx_spu_r() channel %d attack/decay/sustain = %04x\n", n_channel, chip->m_p_n_attackdecaysustain[ n_channel ] );
}
if( ACCESSING_MSW32 )
if( ACCESSING_WORD_1 )
{
verboselog( 1, "psx_spu_r() channel %d sustain/release = %04x\n", n_channel, chip->m_p_n_sustainrelease[ n_channel ] );
}
return ( chip->m_p_n_sustainrelease[ n_channel ] << 16 ) | chip->m_p_n_attackdecaysustain[ n_channel ];
case SPU_CHANNEL_REG( 0xc ):
if( ACCESSING_LSW32 )
if( ACCESSING_WORD_0 )
{
verboselog( 1, "psx_spu_r() channel %d adsr volume = %04x\n", n_channel, chip->m_p_n_adsrvolume[ n_channel ] );
}
if( ACCESSING_MSW32 )
if( ACCESSING_WORD_1 )
{
verboselog( 1, "psx_spu_r() channel %d repeat address = %04x\n", n_channel, chip->m_p_n_repeataddress[ n_channel ] );
}
@ -446,48 +446,48 @@ WRITE32_HANDLER( psx_spu_w )
switch( offset % 4 )
{
case SPU_CHANNEL_REG( 0x0 ):
if( ACCESSING_LSW32 )
if( ACCESSING_WORD_0 )
{
chip->m_p_n_volumeleft[ n_channel ] = data & 0xffff;
verboselog( 1, "psx_spu_w() channel %d volume left = %04x\n", n_channel, chip->m_p_n_volumeleft[ n_channel ] );
}
if( ACCESSING_MSW32 )
if( ACCESSING_WORD_1 )
{
chip->m_p_n_volumeright[ n_channel ] = data >> 16;
verboselog( 1, "psx_spu_w() channel %d volume right = %04x\n", n_channel, chip->m_p_n_volumeright[ n_channel ] );
}
break;
case SPU_CHANNEL_REG( 0x4 ):
if( ACCESSING_LSW32 )
if( ACCESSING_WORD_0 )
{
chip->m_p_n_pitch[ n_channel ] = data & 0xffff;
verboselog( 1, "psx_spu_w() channel %d pitch = %04x\n", n_channel, chip->m_p_n_pitch[ n_channel ] );
}
if( ACCESSING_MSW32 )
if( ACCESSING_WORD_1 )
{
chip->m_p_n_address[ n_channel ] = data >> 16;
verboselog( 1, "psx_spu_w() channel %d address = %04x\n", n_channel, chip->m_p_n_address[ n_channel ] );
}
break;
case SPU_CHANNEL_REG( 0x8 ):
if( ACCESSING_LSW32 )
if( ACCESSING_WORD_0 )
{
chip->m_p_n_attackdecaysustain[ n_channel ] = data & 0xffff;
verboselog( 1, "psx_spu_w() channel %d attack/decay/sustain = %04x\n", n_channel, chip->m_p_n_attackdecaysustain[ n_channel ] );
}
if( ACCESSING_MSW32 )
if( ACCESSING_WORD_1 )
{
chip->m_p_n_sustainrelease[ n_channel ] = data >> 16;
verboselog( 1, "psx_spu_w() channel %d sustain/release = %04x\n", n_channel, chip->m_p_n_sustainrelease[ n_channel ] );
}
break;
case SPU_CHANNEL_REG( 0xc ):
if( ACCESSING_LSW32 )
if( ACCESSING_WORD_0 )
{
chip->m_p_n_adsrvolume[ n_channel ] = data & 0xffff;
verboselog( 1, "psx_spu_w() channel %d adsr volume = %04x\n", n_channel, chip->m_p_n_adsrvolume[ n_channel ] );
}
if( ACCESSING_MSW32 )
if( ACCESSING_WORD_1 )
{
chip->m_p_n_repeataddress[ n_channel ] = data >> 16;
verboselog( 1, "psx_spu_w() channel %d repeat address = %04x\n", n_channel, chip->m_p_n_repeataddress[ n_channel ] );
@ -503,24 +503,24 @@ WRITE32_HANDLER( psx_spu_w )
switch( offset )
{
case SPU_REG( 0xd80 ):
if( ACCESSING_LSW32 )
if( ACCESSING_WORD_0 )
{
chip->m_n_mainvolumeleft = data & 0xffff;
verboselog( 1, "psx_spu_w() main volume left = %04x\n", chip->m_n_mainvolumeleft );
}
if( ACCESSING_MSW32 )
if( ACCESSING_WORD_1 )
{
chip->m_n_mainvolumeright = data >> 16;
verboselog( 1, "psx_spu_w() main volume right = %04x\n", chip->m_n_mainvolumeright );
}
break;
case SPU_REG( 0xd84 ):
if( ACCESSING_LSW32 )
if( ACCESSING_WORD_0 )
{
chip->m_n_reverberationdepthleft = data & 0xffff;
verboselog( 1, "psx_spu_w() reverberation depth left = %04x\n", chip->m_n_reverberationdepthleft );
}
if( ACCESSING_MSW32 )
if( ACCESSING_WORD_1 )
{
chip->m_n_reverberationdepthright = data >> 16;
verboselog( 1, "psx_spu_w() reverberation depth right = %04x\n", chip->m_n_reverberationdepthright );
@ -564,23 +564,23 @@ WRITE32_HANDLER( psx_spu_w )
verboselog( 1, "psx_spu_w() channel on/off = %08x\n", chip->m_n_channelonoff );
break;
case SPU_REG( 0xda0 ):
if( ACCESSING_LSW32 )
if( ACCESSING_WORD_0 )
{
verboselog( 0, "psx_spu_w( %08x, %08x, %08x ) %08x\n", offset, mem_mask, data, 0xc00 + ( offset * 4 ) );
}
if( ACCESSING_MSW32 )
if( ACCESSING_WORD_1 )
{
chip->m_n_reverbworkareastart = data >> 16;
verboselog( 1, "psx_spu_w() reverb work area start = %04x\n", chip->m_n_reverbworkareastart );
}
break;
case SPU_REG( 0xda4 ):
if( ACCESSING_LSW32 )
if( ACCESSING_WORD_0 )
{
chip->m_n_irqaddress = data & 0xffff;
verboselog( 1, "psx_spu_w() irq address = %04x\n", chip->m_n_irqaddress );
}
if( ACCESSING_MSW32 )
if( ACCESSING_WORD_1 )
{
chip->m_n_spuoffset = ( data >> 16 ) * 4;
chip->m_n_spuoffset %= ( SPU_RAM_SIZE / 2 );
@ -588,14 +588,14 @@ WRITE32_HANDLER( psx_spu_w )
}
break;
case SPU_REG( 0xda8 ):
if( ACCESSING_LSW32 )
if( ACCESSING_WORD_0 )
{
chip->m_n_spudata = data & 0xffff;
chip->m_p_n_spuram[ chip->m_n_spuoffset++ ] = chip->m_n_spudata;
chip->m_n_spuoffset %= ( SPU_RAM_SIZE / 2 );
verboselog( 1, "psx_spu_w() spu data = %04x\n", chip->m_n_spudata );
}
if( ACCESSING_MSW32 )
if( ACCESSING_WORD_1 )
{
chip->m_n_spucontrol = data >> 16;
verboselog( 1, "psx_spu_w() spu control = %04x\n", chip->m_n_spucontrol );
@ -607,24 +607,24 @@ WRITE32_HANDLER( psx_spu_w )
verboselog( 1, "psx_spu_w() spu status = %08x\n", chip->m_n_spustatus );
break;
case SPU_REG( 0xdb0 ):
if( ACCESSING_LSW32 )
if( ACCESSING_WORD_0 )
{
chip->m_n_cdvolumeleft = data & 0xffff;
verboselog( 1, "psx_spu_w() cd volume left = %04x\n", chip->m_n_cdvolumeleft );
}
if( ACCESSING_MSW32 )
if( ACCESSING_WORD_1 )
{
chip->m_n_cdvolumeright = data >> 16;
verboselog( 1, "psx_spu_w() cd volume right = %04x\n", chip->m_n_cdvolumeright );
}
break;
case SPU_REG( 0xdb4 ):
if( ACCESSING_LSW32 )
if( ACCESSING_WORD_0 )
{
chip->m_n_externalvolumeleft = data & 0xffff;
verboselog( 1, "psx_spu_w() external volume left = %04x\n", chip->m_n_externalvolumeleft );
}
if( ACCESSING_MSW32 )
if( ACCESSING_WORD_1 )
{
chip->m_n_externalvolumeright = data >> 16;
verboselog( 1, "psx_spu_w() external volume right = %04x\n", chip->m_n_externalvolumeright );

8
src/emu/sound/saa1099.c
View File

@ -459,25 +459,25 @@ WRITE8_HANDLER( saa1099_write_port_1_w )
WRITE16_HANDLER( saa1099_control_port_0_lsb_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
saa1099_control_port_w(0, offset, data & 0xff);
}
WRITE16_HANDLER( saa1099_write_port_0_lsb_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
saa1099_write_port_w(0, offset, data & 0xff);
}
WRITE16_HANDLER( saa1099_control_port_1_lsb_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
saa1099_control_port_w(1, offset, data & 0xff);
}
WRITE16_HANDLER( saa1099_write_port_1_lsb_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
saa1099_write_port_w(1, offset, data & 0xff);
}

16
src/emu/sound/ymz280b.c
View File

@ -1002,25 +1002,25 @@ WRITE8_HANDLER( YMZ280B_register_1_w )
WRITE16_HANDLER( YMZ280B_register_0_lsb_w )
{
struct YMZ280BChip *chip = sndti_token(SOUND_YMZ280B, 0);
if (ACCESSING_LSB) chip->current_register = data & 0xff;
if (ACCESSING_BYTE_0) chip->current_register = data & 0xff;
}
WRITE16_HANDLER( YMZ280B_register_0_msb_w )
{
struct YMZ280BChip *chip = sndti_token(SOUND_YMZ280B, 0);
if (ACCESSING_MSB) chip->current_register = (data >> 8) & 0xff;
if (ACCESSING_BYTE_1) chip->current_register = (data >> 8) & 0xff;
}
WRITE16_HANDLER( YMZ280B_register_1_lsb_w )
{
struct YMZ280BChip *chip = sndti_token(SOUND_YMZ280B, 1);
if (ACCESSING_LSB) chip->current_register = data & 0xff;
if (ACCESSING_BYTE_0) chip->current_register = data & 0xff;
}
WRITE16_HANDLER( YMZ280B_register_1_msb_w )
{
struct YMZ280BChip *chip = sndti_token(SOUND_YMZ280B, 1);
if (ACCESSING_MSB) chip->current_register = (data >> 8) & 0xff;
if (ACCESSING_BYTE_1) chip->current_register = (data >> 8) & 0xff;
}
/**********************************************************************************************
@ -1044,25 +1044,25 @@ WRITE8_HANDLER( YMZ280B_data_1_w )
WRITE16_HANDLER( YMZ280B_data_0_lsb_w )
{
struct YMZ280BChip *chip = sndti_token(SOUND_YMZ280B, 0);
if (ACCESSING_LSB) write_to_register(chip, data & 0xff);
if (ACCESSING_BYTE_0) write_to_register(chip, data & 0xff);
}
WRITE16_HANDLER( YMZ280B_data_0_msb_w )
{
struct YMZ280BChip *chip = sndti_token(SOUND_YMZ280B, 0);
if (ACCESSING_MSB) write_to_register(chip, (data >> 8) & 0xff);
if (ACCESSING_BYTE_1) write_to_register(chip, (data >> 8) & 0xff);
}
WRITE16_HANDLER( YMZ280B_data_1_lsb_w )
{
struct YMZ280BChip *chip = sndti_token(SOUND_YMZ280B, 1);
if (ACCESSING_LSB) write_to_register(chip, data & 0xff);
if (ACCESSING_BYTE_0) write_to_register(chip, data & 0xff);
}
WRITE16_HANDLER( YMZ280B_data_1_msb_w )
{
struct YMZ280BChip *chip = sndti_token(SOUND_YMZ280B, 1);
if (ACCESSING_MSB) write_to_register(chip, (data >> 8) & 0xff);
if (ACCESSING_BYTE_1) write_to_register(chip, (data >> 8) & 0xff);
}
/**********************************************************************************************

4
src/emu/video/tlc34076.c
View File

@ -249,7 +249,7 @@ READ16_HANDLER( tlc34076_lsb_r )
WRITE16_HANDLER( tlc34076_lsb_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
tlc34076_w(machine, offset, data);
}
@ -260,7 +260,7 @@ READ16_HANDLER( tlc34076_msb_r )
WRITE16_HANDLER( tlc34076_msb_w )
{
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
tlc34076_w(machine, offset, data >> 8);
}

24
src/emu/video/voodoo.c
View File

@ -3164,9 +3164,9 @@ static INT32 lfb_w(voodoo_state *v, offs_t offset, UINT32 data, UINT32 mem_mask,
y = (offset >> v->fbi.lfb_stride) & ((1 << v->fbi.lfb_stride) - 1);
/* adjust the mask based on which half of the data is written */
if ((mem_mask & 0x0000ffff) == 0x0000ffff)
if (!ACCESSING_WORD_0)
mask &= ~(0x0f - LFB_DEPTH_PRESENT_MSW);
if ((mem_mask & 0xffff0000) == 0xffff0000)
if (!ACCESSING_WORD_1)
mask &= ~(0xf0 + LFB_DEPTH_PRESENT_MSW);
/* select the target buffer */
@ -3688,9 +3688,9 @@ static void voodoo_w(voodoo_state *v, offs_t offset, UINT32 data, UINT32 mem_mas
/* modify the offset based on the mem_mask */
if (mem_mask)
{
if (mem_mask & 0xffff0000)
if (!ACCESSING_WORD_1)
offset |= 0x80000000;
if (mem_mask & 0x0000ffff)
if (!ACCESSING_WORD_0)
offset |= 0x40000000;
}
@ -4268,13 +4268,13 @@ static UINT32 banshee_io_r(voodoo_state *v, offs_t offset, UINT32 mem_mask)
case io_vgac0: case io_vgac4: case io_vgac8: case io_vgacc:
case io_vgad0: case io_vgad4: case io_vgad8: case io_vgadc:
result = 0;
if (!(mem_mask & 0x000000ff))
if (ACCESSING_BYTE_0)
result |= banshee_vga_r(v, offset*4+0) << 0;
if (!(mem_mask & 0x0000ff00))
if (ACCESSING_BYTE_1)
result |= banshee_vga_r(v, offset*4+1) << 8;
if (!(mem_mask & 0x00ff0000))
if (ACCESSING_BYTE_2)
result |= banshee_vga_r(v, offset*4+2) << 16;
if (!(mem_mask & 0xff000000))
if (ACCESSING_BYTE_3)
result |= banshee_vga_r(v, offset*4+3) << 24;
break;
@ -4563,13 +4563,13 @@ static void banshee_io_w(voodoo_state *v, offs_t offset, UINT32 data, UINT32 mem
case io_vgab0: case io_vgab4: case io_vgab8: case io_vgabc:
case io_vgac0: case io_vgac4: case io_vgac8: case io_vgacc:
case io_vgad0: case io_vgad4: case io_vgad8: case io_vgadc:
if (!(mem_mask & 0x000000ff))
if (ACCESSING_BYTE_0)
banshee_vga_w(v, offset*4+0, data >> 0);
if (!(mem_mask & 0x0000ff00))
if (ACCESSING_BYTE_1)
banshee_vga_w(v, offset*4+1, data >> 8);
if (!(mem_mask & 0x00ff0000))
if (ACCESSING_BYTE_2)
banshee_vga_w(v, offset*4+2, data >> 16);
if (!(mem_mask & 0xff000000))
if (ACCESSING_BYTE_3)
banshee_vga_w(v, offset*4+3, data >> 24);
break;

2
src/mame/audio/aztarac.c
View File

@ -18,7 +18,7 @@ READ16_HANDLER( aztarac_sound_r )
WRITE16_HANDLER( aztarac_sound_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
data &= 0xff;
soundlatch_w(machine, offset, data);

2
src/mame/audio/cchasm.c
View File

@ -88,7 +88,7 @@ WRITE16_HANDLER( cchasm_io_w )
{
static int led;
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
{
data >>= 8;
switch (offset & 0xf)

2
src/mame/audio/cyberbal.c
View File

@ -146,7 +146,7 @@ READ16_HANDLER( cyberbal_sound_68k_r )
WRITE16_HANDLER( cyberbal_sound_68k_w )
{
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
{
sound_data_from_68k = (data >> 8) & 0xff;
sound_data_from_68k_ready = 1;

4
src/mame/audio/dcs.c
View File

@ -1411,13 +1411,13 @@ WRITE32_HANDLER( dsio_idma_data_w )
{
UINT32 pc = activecpu_get_pc();
cpuintrf_push_context(dcs.cpunum);
if ((mem_mask & 0x0000ffff) != 0x0000ffff)
if (ACCESSING_WORD_0)
{
if (LOG_DCS_TRANSFERS)
logerror("%08X:IDMA_data_w(%04X) = %04X\n", pc, adsp2181_idma_addr_r(), data & 0xffff);
adsp2181_idma_data_w(data & 0xffff);
}
if ((mem_mask & 0xffff0000) != 0xffff0000)
if (ACCESSING_WORD_1)
{
if (LOG_DCS_TRANSFERS)
logerror("%08X:IDMA_data_w(%04X) = %04X\n", pc, adsp2181_idma_addr_r(), data >> 16);

2
src/mame/audio/jaguar.c
View File

@ -367,7 +367,7 @@ static WRITE32_HANDLER( dsp_flags_w )
/* if they were clearing the A2S interrupt, see if we are headed for the spin */
/* loop with R22 != 0; if we are, just start spinning again */
if (cpu_getactivecpu() == 2 && !(mem_mask & 0x0000ff00) && (data & 0x400))
if (cpu_getactivecpu() == 2 && ACCESSING_BYTE_1 && (data & 0x400))
{
/* see if we're going back to the spin loop */
if (!(data & 0x04000) && activecpu_get_reg(JAGUAR_R22) != 0)

16
src/mame/audio/leland.c
View File

@ -1163,7 +1163,7 @@ static READ16_HANDLER( i80186_internal_port_r )
case 0x60/2:
if (LOG_PORTS) logerror("%05X:read 80186 Timer %d count\n", activecpu_get_pc(), (offset - 0x50/2) / 4);
which = (offset - 0x50/2) / 4;
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
internal_timer_sync(which);
return i80186.timer[which].count;
@ -1269,9 +1269,9 @@ static WRITE16_HANDLER( i80186_internal_port_w )
int temp, which;
/* handle partials */
if (!ACCESSING_MSB)
if (!ACCESSING_BYTE_1)
data = (i80186_internal_port_r(machine, offset, 0) & 0xff00) | (data & 0x00ff);
else if (!ACCESSING_LSB)
else if (!ACCESSING_BYTE_0)
data = (i80186_internal_port_r(machine, offset, 0) & 0x00ff) | (data & 0xff00);
switch (offset)
@ -1576,7 +1576,7 @@ static WRITE16_HANDLER( pit8254_w )
int reg = offset & 3;
/* ignore odd offsets */
if (!ACCESSING_LSB)
if (!ACCESSING_BYTE_0)
return;
data &= 0xff;
@ -1825,7 +1825,7 @@ static WRITE16_HANDLER( dac_w )
struct dac_state *d = &dac[which];
/* handle value changes */
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
int count = (d->bufin - d->bufout) & DAC_BUFFER_SIZE_MASK;
@ -1851,7 +1851,7 @@ static WRITE16_HANDLER( dac_w )
}
/* handle volume changes */
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
{
d->volume = ((data >> 8) ^ 0x00) / DAC_VOLUME_SCALE;
if (LOG_DAC) logerror("%05X:DAC %d volume = %02X\n", activecpu_get_pc(), offset, data);
@ -1897,7 +1897,7 @@ static WRITE16_HANDLER( dac_10bit_w )
int data16;
/* warning: this assumes all port writes here are word-sized */
assert(ACCESSING_LSB && ACCESSING_MSB);
assert(ACCESSING_BYTE_0 && ACCESSING_BYTE_1);
data16 = data;
/* set the new value */
@ -1930,7 +1930,7 @@ static WRITE16_HANDLER( ataxx_dac_control )
case 0x00:
case 0x01:
case 0x02:
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
dac_w(machine, offset, data, 0xff00);
return;

2
src/mame/audio/m72.c
View File

@ -123,7 +123,7 @@ void m72_ym2151_irq_handler(int irq)
WRITE16_HANDLER( m72_sound_command_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
soundlatch_w(machine,offset,data);
timer_call_after_resynch(NULL, Z80_ASSERT,setvector_callback);

4
src/mame/audio/mcr.c
View File

@ -549,7 +549,7 @@ static READ16_HANDLER( csdeluxe_pia_r )
/* My guess is that Turbo Tag works through a fluke, whereby the 68000 */
/* using the MOVEP instruction outputs the same value on the high and */
/* low bytes. */
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
return pia_0_alt_r(machine, offset) << 8;
else
return pia_0_alt_r(machine, offset);
@ -557,7 +557,7 @@ static READ16_HANDLER( csdeluxe_pia_r )
static WRITE16_HANDLER( csdeluxe_pia_w )
{
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
pia_0_alt_w(machine, offset, data >> 8);
else
pia_0_alt_w(machine, offset, data);

2
src/mame/audio/seibu.c
View File

@ -434,7 +434,7 @@ READ16_HANDLER( seibu_main_word_r )
WRITE16_HANDLER( seibu_main_word_w )
{
//logerror("%06x: seibu_main_word_w(%x,%02x)\n",activecpu_get_pc(),offset,data);
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
switch (offset)
{

8
src/mame/audio/taitosnd.c
View File

@ -265,12 +265,12 @@ READ8_HANDLER( taitosound_slave_comm_r )
WRITE16_HANDLER( taitosound_port16_lsb_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
taitosound_port_w(machine,0,data & 0xff);
}
WRITE16_HANDLER( taitosound_comm16_lsb_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
taitosound_comm_w(machine,0,data & 0xff);
}
READ16_HANDLER( taitosound_comm16_lsb_r )
@ -281,12 +281,12 @@ READ16_HANDLER( taitosound_comm16_lsb_r )
WRITE16_HANDLER( taitosound_port16_msb_w )
{
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
taitosound_port_w(machine,0,data >> 8);
}
WRITE16_HANDLER( taitosound_comm16_msb_w )
{
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
taitosound_comm_w(machine,0,data >> 8);
}
READ16_HANDLER( taitosound_comm16_msb_r )

4
src/mame/drivers/acommand.c
View File

@ -326,14 +326,14 @@ static WRITE16_HANDLER(ac_devices_w)
switch(offset)
{
case 0x16/2:
if(ACCESSING_LSB)
if(ACCESSING_BYTE_0)
{
logerror("Request to play sample %02x with rom 2\n",data);
OKIM6295_data_0_w(machine,0,data);
}
break;
case 0x1a/2:
if(ACCESSING_LSB)
if(ACCESSING_BYTE_0)
{
logerror("Request to play sample %02x with rom 1\n",data);
OKIM6295_data_1_w(machine,0,data);

4
src/mame/drivers/aerofgt.c
View File

@ -105,7 +105,7 @@ static int pending_command;
static WRITE16_HANDLER( sound_command_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
pending_command = 1;
soundlatch_w(machine,offset,data & 0xff);
@ -115,7 +115,7 @@ static WRITE16_HANDLER( sound_command_w )
static WRITE16_HANDLER( turbofrc_sound_command_w )
{
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
{
pending_command = 1;
soundlatch_w(machine,offset,(data >> 8) & 0xff);

14
src/mame/drivers/alpha68k.c
View File

@ -257,7 +257,7 @@ static WRITE16_HANDLER( alpha_microcontroller_w )
{
logerror("%04x: Alpha write trigger at %04x (%04x)\n",activecpu_get_pc(),offset,data);
/* 0x44 = coin clear signal to microcontroller? */
if (offset==0x2d && ACCESSING_LSB)
if (offset==0x2d && ACCESSING_BYTE_0)
alpha68k_flipscreen_w(data & 1);
}
@ -322,28 +322,28 @@ static READ16_HANDLER( jongbou_inputs_r )
static WRITE16_HANDLER( kyros_sound_w )
{
if(ACCESSING_MSB)
if(ACCESSING_BYTE_1)
soundlatch_w(machine, 0, (data>>8)&0xff);
}
static WRITE16_HANDLER( alpha68k_II_sound_w )
{
if(ACCESSING_LSB)
if(ACCESSING_BYTE_0)
soundlatch_w(machine, 0, data&0xff);
}
static WRITE16_HANDLER( alpha68k_V_sound_w )
{
/* Sound & fix bank select are in the same word */
if(ACCESSING_LSB)
if(ACCESSING_BYTE_0)
soundlatch_w(machine,0,data&0xff);
if(ACCESSING_MSB)
if(ACCESSING_BYTE_1)
alpha68k_V_video_bank_w((data>>8)&0xff);
}
//AT
static WRITE16_HANDLER( paddlema_soundlatch_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
soundlatch_w(machine, 0, data);
cpunum_set_input_line(Machine, 1, 0, HOLD_LINE);
@ -352,7 +352,7 @@ static WRITE16_HANDLER( paddlema_soundlatch_w )
static WRITE16_HANDLER( tnexspce_soundlatch_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
soundlatch_w(machine, 0, data);
cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE);

4
src/mame/drivers/arcadecl.c
View File

@ -133,7 +133,7 @@ static READ16_HANDLER( adpcm_r )
static WRITE16_HANDLER( adpcm_w )
{
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
OKIM6295_data_0_w(machine, offset, (data >> 8) & 0xff);
}
@ -154,7 +154,7 @@ static WRITE16_HANDLER( latch_w )
*/
/* lower byte being modified? */
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
OKIM6295_set_bank_base(0, (data & 0x80) ? 0x40000 : 0x00000);
atarigen_set_oki6295_vol(machine, (data & 0x001f) * 100 / 0x1f);

2
src/mame/drivers/armedf.c
View File

@ -233,7 +233,7 @@ static WRITE16_HANDLER( kodure_io_w )
static WRITE16_HANDLER( sound_command_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
soundlatch_w(machine,0,((data & 0x7f) << 1) | 1);
}

2
src/mame/drivers/ashnojoe.c
View File

@ -107,7 +107,7 @@ static READ16_HANDLER(fake_4a00a_r)
static WRITE16_HANDLER( ashnojoe_soundlatch_w )
{
if(ACCESSING_LSB)
if(ACCESSING_BYTE_0)
{
soundlatch_w(machine,0,data & 0xff);
//needed?

2
src/mame/drivers/asterix.c
View File

@ -90,7 +90,7 @@ static READ16_HANDLER( control2_r )
static WRITE16_HANDLER( control2_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
cur_control2 = data;
/* bit 0 is data */

8
src/mame/drivers/astrocorp.c
View File

@ -100,7 +100,7 @@ static READ16_HANDLER( astrocorp_eeprom_r )
static WRITE16_HANDLER( astrocorp_eeprom_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
// latch the bit
EEPROM_write_bit(data & 0x01);
@ -115,7 +115,7 @@ static WRITE16_HANDLER( astrocorp_eeprom_w )
static WRITE16_HANDLER( astrocorp_sound_bank_w )
{
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
{
OKIM6295_set_bank_base(0, 0x40000 * ((data >> 8) & 1) );
// logerror("CPU #0 PC %06X: OKI bank %08X\n",activecpu_get_pc(),data);
@ -124,14 +124,14 @@ static WRITE16_HANDLER( astrocorp_sound_bank_w )
static WRITE16_HANDLER( astrocorp_outputs_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
coin_counter_w(0, (data & 0x0004)); // coin counter
set_led_status(0, (data & 0x0008)); // you win
if ( (data & 0x0010)) dispensed_tickets++; // coin out
set_led_status(1, (data & 0x0020)); // coin/hopper jam
}
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
{
set_led_status(2, (data & 0x0100)); // bet
set_led_status(3, (data & 0x0800)); // start

2
src/mame/drivers/atarig1.c
View File

@ -89,7 +89,7 @@ static MACHINE_RESET( atarig1 )
static WRITE16_HANDLER( mo_control_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
atarirle_control_w(0, data & 7);
}

4
src/mame/drivers/atarig42.c
View File

@ -106,7 +106,7 @@ static READ16_HANDLER( a2d_data_r )
static WRITE16_HANDLER( io_latch_w )
{
/* upper byte */
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
{
/* bit 14 controls the ASIC65 reset line */
asic65_reset((~data >> 14) & 1);
@ -116,7 +116,7 @@ static WRITE16_HANDLER( io_latch_w )
}
/* lower byte */
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
/* bit 4 resets the sound CPU */
cpunum_set_input_line(machine, 2, INPUT_LINE_RESET, (data & 0x10) ? CLEAR_LINE : ASSERT_LINE);

22
src/mame/drivers/atarigt.c
View File

@ -206,13 +206,13 @@ static WRITE32_HANDLER( latch_w )
*/
/* upper byte */
if (!(mem_mask & 0xff000000))
if (ACCESSING_BYTE_3)
{
/* bits 13-11 are the MO control bits */
atarirle_control_w(0, (data >> 27) & 7);
}
if (!(mem_mask & 0x00ff0000))
if (ACCESSING_BYTE_2)
{
// cage_reset_w(data & 0x00100000);
coin_counter_w(0, data & 0x00080000);
@ -224,7 +224,7 @@ static WRITE32_HANDLER( latch_w )
static WRITE32_HANDLER( mo_command_w )
{
COMBINE_DATA(mo_command);
if (ACCESSING_LSW32)
if (ACCESSING_WORD_0)
atarirle_command_w(0, ((data & 0xffff) == 2) ? ATARIRLE_COMMAND_CHECKSUM : ATARIRLE_COMMAND_DRAW);
}
@ -246,9 +246,9 @@ static READ32_HANDLER( sound_data_r )
{
UINT32 result = 0;
if (ACCESSING_LSW32)
if (ACCESSING_WORD_0)
result |= cage_control_r();
if (ACCESSING_MSW32)
if (ACCESSING_WORD_1)
result |= main_from_cage_r() << 16;
return result;
}
@ -256,9 +256,9 @@ static READ32_HANDLER( sound_data_r )
static WRITE32_HANDLER( sound_data_w )
{
if (ACCESSING_LSW32)
if (ACCESSING_WORD_0)
cage_control_w(data);
if (ACCESSING_MSW32)
if (ACCESSING_WORD_1)
main_to_cage_w(data >> 16);
}
@ -568,13 +568,13 @@ static READ32_HANDLER( colorram_protection_r )
UINT32 result32 = 0;
UINT16 result;
if ((mem_mask & 0xffff0000) != 0xffff0000)
if (ACCESSING_WORD_1)
{
result = atarigt_colorram_r(address);
(*protection_r)(address, &result);
result32 |= result << 16;
}
if ((mem_mask & 0x0000ffff) != 0x0000ffff)
if (ACCESSING_WORD_0)
{
result = atarigt_colorram_r(address + 2);
(*protection_r)(address + 2, &result);
@ -589,13 +589,13 @@ static WRITE32_HANDLER( colorram_protection_w )
{
offs_t address = 0xd80000 + offset * 4;
if ((mem_mask & 0xffff0000) != 0xffff0000)
if (ACCESSING_WORD_1)
{
if (!ignore_writes)
atarigt_colorram_w(address, data >> 16, mem_mask >> 16);
(*protection_w)(address, data >> 16);
}
if ((mem_mask & 0x0000ffff) != 0x0000ffff)
if (ACCESSING_WORD_0)
{
if (!ignore_writes)
atarigt_colorram_w(address + 2, data, mem_mask);

18
src/mame/drivers/atarigx2.c
View File

@ -98,9 +98,9 @@ static READ32_HANDLER( special_port3_r )
#if 0
static WRITE32_HANDLER( a2d_select_w )
{
if (ACCESSING_MSW32)
if (ACCESSING_WORD_1)
which_input = offset * 2;
if (ACCESSING_LSW32)
if (ACCESSING_WORD_0)
which_input = offset * 2 + 1;
}
#endif
@ -136,14 +136,14 @@ static WRITE32_HANDLER( latch_w )
logerror("latch_w(%08X) & %08X\n", data, ~mem_mask);
/* upper byte */
if (!(mem_mask & 0xff000000))
if (ACCESSING_BYTE_3)
{
/* bits 13-11 are the MO control bits */
atarirle_control_w(0, (data >> 27) & 7);
}
/* lower byte */
if (!(mem_mask & 0x00ff0000))
if (ACCESSING_BYTE_2)
cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, (data & 0x100000) ? CLEAR_LINE : ASSERT_LINE);
}
@ -151,7 +151,7 @@ static WRITE32_HANDLER( latch_w )
static WRITE32_HANDLER( mo_command_w )
{
COMBINE_DATA(mo_command);
if (ACCESSING_LSW32)
if (ACCESSING_WORD_0)
atarirle_command_w(0, ((data & 0xffff) == 2) ? ATARIRLE_COMMAND_CHECKSUM : ATARIRLE_COMMAND_DRAW);
}
@ -173,7 +173,7 @@ static WRITE32_HANDLER( atarigx2_protection_w )
// if (pc == 0x11cbe || pc == 0x11c30)
// logerror("%06X:Protection W@%04X = %04X (result to %06X)\n", pc, offset, data, activecpu_get_reg(M68K_A2));
// else
if (ACCESSING_MSW32)
if (ACCESSING_WORD_1)
logerror("%06X:Protection W@%04X = %04X\n", pc, offset * 4, data >> 16);
else
logerror("%06X:Protection W@%04X = %04X\n", pc, offset * 4 + 2, data);
@ -181,12 +181,12 @@ static WRITE32_HANDLER( atarigx2_protection_w )
COMBINE_DATA(&protection_base[offset]);
if (ACCESSING_MSW32)
if (ACCESSING_WORD_1)
{
last_write = protection_base[offset] >> 16;
last_write_offset = offset*2;
}
if (ACCESSING_LSW32)
if (ACCESSING_WORD_0)
{
last_write = protection_base[offset] & 0xffff;
last_write_offset = offset*2+1;
@ -1153,7 +1153,7 @@ static READ32_HANDLER( atarigx2_protection_r )
}
}
if (ACCESSING_MSW32)
if (ACCESSING_WORD_1)
logerror("%06X:Protection R@%04X = %04X\n", activecpu_get_previouspc(), offset * 4, result >> 16);
else
logerror("%06X:Protection R@%04X = %04X\n", activecpu_get_previouspc(), offset * 4 + 2, result);

4
src/mame/drivers/atarisy2.c
View File

@ -301,7 +301,7 @@ static WRITE16_HANDLER( int0_ack_w )
static WRITE16_HANDLER( int1_ack_w )
{
/* reset sound CPU */
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, (data & 1) ? ASSERT_LINE : CLEAR_LINE);
}
@ -314,7 +314,7 @@ static TIMER_CALLBACK( delayed_int_enable_w )
static WRITE16_HANDLER( int_enable_w )
{
if (offset == 0 && ACCESSING_LSB)
if (offset == 0 && ACCESSING_BYTE_0)
timer_call_after_resynch(NULL, data, delayed_int_enable_w);
}

2
src/mame/drivers/backfire.c
View File

@ -252,7 +252,7 @@ static READ32_HANDLER(backfire_control3_r)
static WRITE32_HANDLER(backfire_eeprom_w)
{
logerror("%08x:write eprom %08x (%08x) %08x\n",activecpu_get_pc(),offset<<1,mem_mask,data);
if (ACCESSING_LSB32) {
if (ACCESSING_BYTE_0) {
EEPROM_set_clock_line((data & 0x2) ? ASSERT_LINE : CLEAR_LINE);
EEPROM_write_bit(data & 0x1);
EEPROM_set_cs_line((data & 0x4) ? CLEAR_LINE : ASSERT_LINE);

2
src/mame/drivers/beathead.c
View File

@ -310,7 +310,7 @@ static READ32_HANDLER( sound_data_r )
static WRITE32_HANDLER( sound_data_w )
{
if (ACCESSING_LSB32)
if (ACCESSING_BYTE_0)
atarigen_sound_w(machine,offset, data, mem_mask);
}

2
src/mame/drivers/bigfghtr.c
View File

@ -278,7 +278,7 @@ static VIDEO_EOF( bigfghtr )
static WRITE16_HANDLER( sound_command_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
soundlatch_w(machine,0,((data & 0x7f) << 1) | 1);
}

20
src/mame/drivers/bishjan.c
View File

@ -122,7 +122,7 @@ if (input_code_pressed(KEYCODE_Z))
static WRITE16_HANDLER(colordac_w)
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
colorram[clr_offset] = data;
palette_set_color_rgb(Machine, clr_offset/3,
@ -133,7 +133,7 @@ static WRITE16_HANDLER(colordac_w)
clr_offset = (clr_offset+1) % (256*3);
}
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
{
clr_offset = (data>>8) * 3;
}
@ -145,17 +145,17 @@ static UINT16 bishjan_low;
static WRITE16_HANDLER( bishjan_low_w )
{
if (ACCESSING_MSB) bishjan_low = data >> 8;
if (ACCESSING_BYTE_1) bishjan_low = data >> 8;
}
static WRITE16_HANDLER( bishjan_tmap1_w )
{
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
{
bishjan_videoram1[offset*2] = data | bishjan_low;
tilemap_mark_tile_dirty(tmap1, offset*2);
}
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
bishjan_videoram1[offset*2+1] = (data << 8) | bishjan_low;
tilemap_mark_tile_dirty(tmap1, offset*2+1);
@ -163,12 +163,12 @@ static WRITE16_HANDLER( bishjan_tmap1_w )
}
static WRITE16_HANDLER( bishjan_tmap2_w )
{
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
{
bishjan_videoram2[offset*2] = data | bishjan_low;
tilemap_mark_tile_dirty(tmap2, offset*2);
}
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
bishjan_videoram2[offset*2+1] = (data << 8) | bishjan_low;
tilemap_mark_tile_dirty(tmap2, offset*2+1);
@ -199,7 +199,7 @@ static UINT16 bishjan_sel, bishjan_input, bishjan_hopper;
static WRITE16_HANDLER( bishjan_sel_w )
{
if (ACCESSING_MSB) bishjan_sel = data >> 8;
if (ACCESSING_BYTE_1) bishjan_sel = data >> 8;
}
static READ16_HANDLER( bishjan_unk_r )
@ -214,7 +214,7 @@ static READ16_HANDLER( bishjan_unk_r )
static WRITE16_HANDLER( bishjan_input_w )
{
if (ACCESSING_MSB) bishjan_input = data >> 8;
if (ACCESSING_BYTE_1) bishjan_input = data >> 8;
}
static READ16_HANDLER( bishjan_input_r )
@ -234,7 +234,7 @@ static READ16_HANDLER( bishjan_input_r )
static WRITE16_HANDLER( bishjan_coin_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
// coin out data & 0x01;
bishjan_hopper = data & 0x02; // hopper

6
src/mame/drivers/blmbycar.c
View File

@ -55,7 +55,7 @@ VIDEO_UPDATE( blmbycar );
static WRITE16_HANDLER( blmbycar_okibank_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
UINT8 *RAM = memory_region(REGION_SOUND1);
memcpy(&RAM[0x30000],&RAM[0x40000 + 0x10000*(data & 0xf)],0x10000);
@ -76,13 +76,13 @@ static UINT8 pot_wheel = 0;
static WRITE16_HANDLER( blmbycar_pot_wheel_reset_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
pot_wheel = ~readinputport(2) & 0xff;
}
static WRITE16_HANDLER( blmbycar_pot_wheel_shift_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
static int old;
if ( ((old & 0xff) == 0xff) && ((data & 0xff) == 0) )

2
src/mame/drivers/blockout.c
View File

@ -37,7 +37,7 @@ static INTERRUPT_GEN( blockout_interrupt )
static WRITE16_HANDLER( blockout_sound_command_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
soundlatch_w(machine,offset,data & 0xff);
cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);

2
src/mame/drivers/btoads.c
View File

@ -77,7 +77,7 @@ static TIMER_CALLBACK( delayed_sound_w )
static WRITE16_HANDLER( main_sound_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
timer_call_after_resynch(NULL, data & 0xff, delayed_sound_w);
}

14
src/mame/drivers/cave.c
View File

@ -271,7 +271,7 @@ static WRITE8_HANDLER( soundlatch_ack_w )
/* Handles writes to the YMZ280B */
static WRITE16_HANDLER( cave_sound_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
if (offset) YMZ280B_data_0_w (machine, offset, data & 0xff);
else YMZ280B_register_0_w (machine, offset, data & 0xff);
@ -329,7 +329,7 @@ static WRITE16_HANDLER( cave_eeprom_msb_w )
if (data & ~0xfe00)
logerror("CPU #0 PC: %06X - Unknown EEPROM bit written %04X\n",activecpu_get_pc(),data);
if ( ACCESSING_MSB ) // even address
if ( ACCESSING_BYTE_1 ) // even address
{
coin_lockout_w(1,~data & 0x8000);
coin_lockout_w(0,~data & 0x4000);
@ -355,7 +355,7 @@ static WRITE16_HANDLER( sailormn_eeprom_msb_w )
static WRITE16_HANDLER( hotdogst_eeprom_msb_w )
{
if ( ACCESSING_MSB ) // even address
if ( ACCESSING_BYTE_1 ) // even address
{
// latch the bit
EEPROM_write_bit(data & 0x0800);
@ -373,7 +373,7 @@ static WRITE16_HANDLER( cave_eeprom_lsb_w )
if (data & ~0x00ef)
logerror("CPU #0 PC: %06X - Unknown EEPROM bit written %04X\n",activecpu_get_pc(),data);
if ( ACCESSING_LSB ) // odd address
if ( ACCESSING_BYTE_0 ) // odd address
{
coin_lockout_w(1,~data & 0x0008);
coin_lockout_w(0,~data & 0x0004);
@ -394,7 +394,7 @@ static WRITE16_HANDLER( cave_eeprom_lsb_w )
/* - No eeprom or lockouts */
static WRITE16_HANDLER( gaia_coin_lsb_w )
{
if ( ACCESSING_LSB ) // odd address
if ( ACCESSING_BYTE_0 ) // odd address
{
coin_counter_w(1, data & 0x0002);
coin_counter_w(0, data & 0x0001);
@ -408,7 +408,7 @@ static WRITE16_HANDLER( metmqstr_eeprom_msb_w )
if (data & ~0xff00)
logerror("CPU #0 PC: %06X - Unknown EEPROM bit written %04X\n",activecpu_get_pc(),data);
if ( ACCESSING_MSB ) // even address
if ( ACCESSING_BYTE_1 ) // even address
{
coin_counter_w(1, data & 0x2000);
coin_counter_w(0, data & 0x1000);
@ -853,7 +853,7 @@ static WRITE16_HANDLER( korokoro_eeprom_msb_w )
show_leds();
}
if ( ACCESSING_MSB ) // even address
if ( ACCESSING_BYTE_1 ) // even address
{
hopper = data & 0x0100; // ???

16
src/mame/drivers/cischeat.c
View File

@ -542,14 +542,14 @@ READ16_HANDLER( scudhamm_analog_r )
*/
static WRITE16_HANDLER( scudhamm_leds_w )
{
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
{
set_led_status(0, data & 0x0100); // 3 buttons
set_led_status(1, data & 0x0200);
set_led_status(2, data & 0x0400);
}
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
// set_led_status(3, data & 0x0010); // if we had more leds..
// set_led_status(4, data & 0x0020);
@ -568,7 +568,7 @@ static WRITE16_HANDLER( scudhamm_enable_w )
static WRITE16_HANDLER( scudhamm_oki_bank_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
OKIM6295_set_bank_base(0, 0x40000 * ((data >> 0) & 0x3) );
OKIM6295_set_bank_base(1, 0x40000 * ((data >> 4) & 0x3) );
@ -656,7 +656,7 @@ static READ16_HANDLER( armchmp2_buttons_r )
*/
static WRITE16_HANDLER( armchmp2_leds_w )
{
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
{
set_led_status(0, data & 0x0100);
set_led_status(1, data & 0x1000);
@ -664,7 +664,7 @@ static WRITE16_HANDLER( armchmp2_leds_w )
set_led_status(3, data & 0x4000);
}
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
coin_counter_w(0, data & 0x0040);
coin_counter_w(1, data & 0x0080);
@ -832,7 +832,7 @@ ADDRESS_MAP_END
static WRITE16_HANDLER( bigrun_soundbank_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
OKIM6295_set_bank_base(0, 0x40000 * ((data >> 0) & 1) );
OKIM6295_set_bank_base(1, 0x40000 * ((data >> 4) & 1) );
@ -866,11 +866,11 @@ ADDRESS_MAP_END
static WRITE16_HANDLER( cischeat_soundbank_0_w )
{
if (ACCESSING_LSB) OKIM6295_set_bank_base(0, 0x40000 * (data & 1) );
if (ACCESSING_BYTE_0) OKIM6295_set_bank_base(0, 0x40000 * (data & 1) );
}
static WRITE16_HANDLER( cischeat_soundbank_1_w )
{
if (ACCESSING_LSB) OKIM6295_set_bank_base(1, 0x40000 * (data & 1) );
if (ACCESSING_BYTE_0) OKIM6295_set_bank_base(1, 0x40000 * (data & 1) );
}
static ADDRESS_MAP_START( cischeat_sound_readmem, ADDRESS_SPACE_PROGRAM, 16 )

2
src/mame/drivers/coolpool.c
View File

@ -192,7 +192,7 @@ static WRITE16_HANDLER( nvram_thrash_w )
static WRITE16_HANDLER( nvram_data_w )
{
/* only the low 8 bits matter */
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
if (nvram_write_enable)
generic_nvram16[offset] = data & 0xff;

16
src/mame/drivers/cps1.c
View File

@ -238,7 +238,7 @@ static WRITE8_HANDLER( cps1_oki_pin7_w )
static WRITE16_HANDLER( cps1_sound_fade_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
cps1_sound_fade_timer = data & 0xff;
}
@ -249,7 +249,7 @@ static READ8_HANDLER( cps1_snd_fade_timer_r )
static WRITE16_HANDLER( cps1_sound_command_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
soundlatch_w(machine,0,data & 0xff);
}
@ -257,7 +257,7 @@ WRITE16_HANDLER( cps1_coinctrl_w )
{
// popmessage("coinctrl %04x",data);
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
{
coin_counter_w(0,data & 0x0100);
coin_counter_w(1,data & 0x0200);
@ -265,7 +265,7 @@ WRITE16_HANDLER( cps1_coinctrl_w )
coin_lockout_w(1,~data & 0x0800);
}
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
/* mercs sets bit 0 */
set_led_status(0,data & 0x02);
@ -276,7 +276,7 @@ WRITE16_HANDLER( cps1_coinctrl_w )
static WRITE16_HANDLER( cpsq_coinctrl2_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
coin_counter_w(2,data & 0x01);
coin_lockout_w(2,~data & 0x02);
@ -339,7 +339,7 @@ READ16_HANDLER( qsound_sharedram1_r )
WRITE16_HANDLER( qsound_sharedram1_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
qsound_sharedram1[offset] = data;
}
@ -350,7 +350,7 @@ static READ16_HANDLER( qsound_sharedram2_r )
static WRITE16_HANDLER( qsound_sharedram2_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
qsound_sharedram2[offset] = data;
}
@ -434,7 +434,7 @@ READ16_HANDLER( cps1_eeprom_port_r )
WRITE16_HANDLER( cps1_eeprom_port_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
/*
bit 0 = data

4
src/mame/drivers/cps2.c
View File

@ -727,7 +727,7 @@ static CUSTOM_INPUT( cps2_eeprom_port_r )
static WRITE16_HANDLER( cps2_eeprom_port_w )
{
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
{
/* bit 0 - Unused */
/* bit 1 - Unused */
@ -744,7 +744,7 @@ static WRITE16_HANDLER( cps2_eeprom_port_w )
EEPROM_set_cs_line((data & 0x4000) ? CLEAR_LINE : ASSERT_LINE);
}
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
/* bit 0 - coin counter 1 */
/* bit 0 - coin counter 2 */

66
src/mame/drivers/cps3.c
View File

@ -1387,7 +1387,7 @@ static UINT32 cram_bank = 0;
static WRITE32_HANDLER( cram_bank_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
// this seems to be related to accesses to the 0x04100000 region
if (cram_bank != data)
@ -1445,22 +1445,22 @@ static READ32_HANDLER( cps3_gfxflash_r )
if(DEBUG_PRINTF) printf("gfxflash_r\n");
if (!(mem_mask & 0xff000000)) // GFX Flash 1
if (ACCESSING_BYTE_3) // GFX Flash 1
{
logerror("read GFX flash chip %d addr %02x\n", flash1-8, (offset<<1));
result |= intelflash_read(flash1, (offset<<1) ) << 24;
}
if (!(mem_mask & 0x00ff0000)) // GFX Flash 2
if (ACCESSING_BYTE_2) // GFX Flash 2
{
logerror("read GFX flash chip %d addr %02x\n", flash2-8, (offset<<1));
result |= intelflash_read(flash2, (offset<<1) ) << 16;
}
if (!(mem_mask & 0x0000ff00)) // GFX Flash 1
if (ACCESSING_BYTE_1) // GFX Flash 1
{
logerror("read GFX flash chip %d addr %02x\n", flash1-8, (offset<<1)+1);
result |= intelflash_read(flash1, (offset<<1)+0x1 ) << 8;
}
if (!(mem_mask & 0x000000ff)) // GFX Flash 2
if (ACCESSING_BYTE_0) // GFX Flash 2
{
logerror("read GFX flash chip %d addr %02x\n", flash2-8, (offset<<1)+1);
result |= intelflash_read(flash2, (offset<<1)+0x1 ) << 0;
@ -1485,25 +1485,25 @@ static WRITE32_HANDLER( cps3_gfxflash_w )
// if(DEBUG_PRINTF) printf("cps3_gfxflash_w %08x %08x %08x\n", offset *2, data, mem_mask);
if (!(mem_mask & 0xff000000)) // GFX Flash 1
if (ACCESSING_BYTE_3) // GFX Flash 1
{
command = (data >> 24) & 0xff;
logerror("write to GFX flash chip %d addr %02x cmd %02x\n", flash1-8, (offset<<1), command);
intelflash_write(flash1, (offset<<1), command);
}
if (!(mem_mask & 0x00ff0000)) // GFX Flash 2
if (ACCESSING_BYTE_2) // GFX Flash 2
{
command = (data >> 16) & 0xff;
logerror("write to GFX flash chip %d addr %02x cmd %02x\n", flash2-8, (offset<<1), command);
intelflash_write(flash2, (offset<<1), command);
}
if (!(mem_mask & 0x0000ff00)) // GFX Flash 1
if (ACCESSING_BYTE_1) // GFX Flash 1
{
command = (data >> 8) & 0xff;
logerror("write to GFX flash chip %d addr %02x cmd %02x\n", flash1-8, (offset<<1)+1, command);
intelflash_write(flash1, (offset<<1)+0x1, command);
}
if (!(mem_mask & 0x000000ff)) // GFX Flash 2
if (ACCESSING_BYTE_0) // GFX Flash 2
{
command = (data >> 0) & 0xff;
//if ( ((offset<<1)+1) != 0x555) printf("write to GFX flash chip %d addr %02x cmd %02x\n", flash1-8, (offset<<1)+1, command);
@ -1536,22 +1536,22 @@ static UINT32 cps3_flashmain_r(int base, UINT32 offset, UINT32 mem_mask)
{
UINT32 result = 0;
if (!(mem_mask & 0xff000000)) // Flash 1
if (ACCESSING_BYTE_3) // Flash 1
{
// logerror("read flash chip %d addr %02x\n", base+0, offset*4 );
result |= (intelflash_read(base+0, offset)<<24);
}
if (!(mem_mask & 0x00ff0000)) // Flash 1
if (ACCESSING_BYTE_2) // Flash 1
{
// logerror("read flash chip %d addr %02x\n", base+1, offset*4 );
result |= (intelflash_read(base+1, offset)<<16);
}
if (!(mem_mask & 0x0000ff00)) // Flash 1
if (ACCESSING_BYTE_1) // Flash 1
{
// logerror("read flash chip %d addr %02x\n", base+2, offset*4 );
result |= (intelflash_read(base+2, offset)<<8);
}
if (!(mem_mask & 0x000000ff)) // Flash 1
if (ACCESSING_BYTE_0) // Flash 1
{
// logerror("read flash chip %d addr %02x\n", base+3, offset*4 );
result |= (intelflash_read(base+3, offset)<<0);
@ -1649,25 +1649,25 @@ static READ32_HANDLER( cps3_flash2_r )
static void cps3_flashmain_w(int base, UINT32 offset, UINT32 data, UINT32 mem_mask)
{
int command;
if (!(mem_mask & 0xff000000)) // Flash 1
if (ACCESSING_BYTE_3) // Flash 1
{
command = (data >> 24) & 0xff;
logerror("write to flash chip %d addr %02x cmd %02x\n", base+0, offset, command);
intelflash_write(base+0, offset, command);
}
if (!(mem_mask & 0x00ff0000)) // Flash 2
if (ACCESSING_BYTE_2) // Flash 2
{
command = (data >> 16) & 0xff;
logerror("write to flash chip %d addr %02x cmd %02x\n", base+1, offset, command);
intelflash_write(base+1, offset, command);
}
if (!(mem_mask & 0x0000ff00)) // Flash 2
if (ACCESSING_BYTE_1) // Flash 2
{
command = (data >> 8) & 0xff;
logerror("write to flash chip %d addr %02x cmd %02x\n", base+2, offset, command);
intelflash_write(base+2, offset, command);
}
if (!(mem_mask & 0x000000ff)) // Flash 2
if (ACCESSING_BYTE_0) // Flash 2
{
command = (data >> 0) & 0xff;
logerror("write to flash chip %d addr %02x cmd %02x\n", base+3, offset, command);
@ -1727,7 +1727,7 @@ static WRITE32_HANDLER( cps3_flash2_w )
static WRITE32_HANDLER( cram_gfxflash_bank_w )
{
if (ACCESSING_MSB32)
if (ACCESSING_BYTE_3)
{
//printf("cram_gfxflash_bank_w MSB32 %08x\n",data);
/*
@ -1774,7 +1774,7 @@ static WRITE32_HANDLER( cram_gfxflash_bank_w )
cram_gfxflash_bank-= 0x0002;// as with sound access etc. first 4 meg is 'special' and skipped
}
if (ACCESSING_LSB32)
if (ACCESSING_BYTE_0)
{
/* if(DEBUG_PRINTF)*/ printf("cram_gfxflash_bank_LSB_w LSB32 %08x\n",data);
}
@ -1822,7 +1822,7 @@ static READ32_HANDLER( cps3_eeprom_r )
if (addr>=0x100 && addr<=0x17f)
{
if (ACCESSING_MSB32) cps3_current_eeprom_read = (cps3_eeprom[offset-0x100/4] & 0xffff0000)>>16;
if (ACCESSING_BYTE_3) cps3_current_eeprom_read = (cps3_eeprom[offset-0x100/4] & 0xffff0000)>>16;
else cps3_current_eeprom_read = (cps3_eeprom[offset-0x100/4] & 0x0000ffff)>>0;
// read word to latch...
return 0x00000000;
@ -1830,7 +1830,7 @@ static READ32_HANDLER( cps3_eeprom_r )
else if (addr == 0x200)
{
// busy flag / read data..
if (ACCESSING_MSB32) return 0;
if (ACCESSING_BYTE_3) return 0;
else
{
//if(DEBUG_PRINTF) printf("reading %04x from eeprom\n", cps3_current_eeprom_read);
@ -1871,12 +1871,12 @@ static READ32_HANDLER( cps3_cdrom_r )
{
UINT32 retval = 0;
if (ACCESSING_MSB32)
if (ACCESSING_BYTE_3)
{
retval |= ((UINT16)wd33c93_r(machine,0))<<16;
}
if (ACCESSING_LSB32)
if (ACCESSING_BYTE_0)
{
retval |= (UINT16)wd33c93_r(machine,1);
}
@ -1886,12 +1886,12 @@ static READ32_HANDLER( cps3_cdrom_r )
static WRITE32_HANDLER( cps3_cdrom_w )
{
if (ACCESSING_MSB32)
if (ACCESSING_BYTE_3)
{
wd33c93_w(machine,0,(data & 0x00ff0000)>>16);
}
if (ACCESSING_LSB32)
if (ACCESSING_BYTE_0)
{
wd33c93_w(machine,1,(data & 0x000000ff)>>0);
}
@ -1910,7 +1910,7 @@ static WRITE32_HANDLER( cps3_ss_pal_base_w )
{
if(DEBUG_PRINTF) printf ("cps3_ss_pal_base_w %08x %08x\n", data, mem_mask);
if(ACCESSING_MSB32)
if(ACCESSING_BYTE_3)
{
cps3_ss_pal_base = (data & 0x00ff0000)>>16;
@ -1951,11 +1951,11 @@ static WRITE32_HANDLER( cps3_palettedma_w )
{
COMBINE_DATA(&paldma_other2);
if (ACCESSING_MSB32)
if (ACCESSING_BYTE_3)
{
paldma_length = (data & 0xffff0000)>>16;
}
if (ACCESSING_LSB32)
if (ACCESSING_BYTE_0)
{
if (data & 0x0002)
{
@ -2226,11 +2226,11 @@ static WRITE32_HANDLER( cps3_characterdma_w )
if (offset==0)
{
//COMBINE_DATA(&chardma_source);
if (ACCESSING_LSB32)
if (ACCESSING_BYTE_0)
{
chardma_source = data & 0x0000ffff;
}
if (ACCESSING_MSB32)
if (ACCESSING_BYTE_3)
{
if(DEBUG_PRINTF) printf("chardma_w accessing MSB32 of offset 0");
}
@ -2239,7 +2239,7 @@ static WRITE32_HANDLER( cps3_characterdma_w )
{
COMBINE_DATA(&chardma_other);
if (ACCESSING_MSB32)
if (ACCESSING_BYTE_3)
{
if ((data>>16) & 0x0040)
{
@ -2290,12 +2290,12 @@ static WRITE32_HANDLER( cps3_colourram_w )
{
// COMBINE_DATA(&cps3_colourram[offset]);
if (ACCESSING_MSB32)
if (ACCESSING_BYTE_3)
{
cps3_set_mame_colours(machine, offset*2, (data & 0xffff0000) >> 16, 0);
}
if (ACCESSING_LSB32)
if (ACCESSING_BYTE_0)
{
cps3_set_mame_colours(machine, offset*2+1, (data & 0x0000ffff) >> 0, 0);
}

2
src/mame/drivers/crospang.c
View File

@ -52,7 +52,7 @@ extern WRITE16_HANDLER ( bestri_tilebank_w );
static WRITE16_HANDLER ( crospang_soundlatch_w )
{
if(ACCESSING_LSB)
if(ACCESSING_BYTE_0)
{
soundlatch_w(machine,0,data & 0xff);
}

2
src/mame/drivers/crshrace.c
View File

@ -163,7 +163,7 @@ static int pending_command;
static WRITE16_HANDLER( sound_command_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
pending_command = 1;
soundlatch_w(machine,offset,data & 0xff);

2
src/mame/drivers/cubocd32.c
View File

@ -72,7 +72,7 @@ static WRITE32_HANDLER( amiga_custom32_w )
static WRITE32_HANDLER( aga_overlay_w )
{
if ((mem_mask & 0x00ff0000) != 0x00ff0000)
if (ACCESSING_BYTE_2)
{
data = (data >> 16) & 1;

12
src/mame/drivers/cybertnk.c
View File

@ -301,35 +301,35 @@ static WRITE16_HANDLER( io_w )
{
case 0:
// sound data
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
cpunum_set_input_line(Machine, 2, 0, HOLD_LINE);
else
LOG_UNKNOWN_WRITE
break;
case 2:
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
;//watchdog ? written in similar context to CPU1 @ 0x140002
else
LOG_UNKNOWN_WRITE
break;
case 6:
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
;//select controller device
else
;//blank inputs
break;
case 8:
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
;//blank inputs
else
LOG_UNKNOWN_WRITE
break;
case 0xc:
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
// This seems to only be written after each irq1 and irq2
logerror("irq wrote %04x\n", data);
else
@ -337,7 +337,7 @@ static WRITE16_HANDLER( io_w )
break;
case 0xd4:
if ( ACCESSING_LSB )
if ( ACCESSING_BYTE_0 )
;// controller device data
else
LOG_UNKNOWN_WRITE

12
src/mame/drivers/darkhors.c
View File

@ -242,7 +242,7 @@ static WRITE32_HANDLER( darkhors_eeprom_w )
if (data & ~0xff000000)
logerror("CPU #0 PC: %06X - Unknown EEPROM bit written %08X\n",activecpu_get_pc(),data);
if ( ACCESSING_MSB32 )
if ( ACCESSING_BYTE_3 )
{
// latch the bit
EEPROM_write_bit(data & 0x04000000);
@ -257,7 +257,7 @@ static WRITE32_HANDLER( darkhors_eeprom_w )
static WRITE32_HANDLER( OKIM6295_data_0_msb32_w )
{
if (ACCESSING_MSB32)
if (ACCESSING_BYTE_3)
OKIM6295_data_0_msb_w(machine, offset, data >> 16, mem_mask >> 16);
}
@ -269,15 +269,15 @@ static READ32_HANDLER( OKIM6295_status_0_msb32_r )
static WRITE32_HANDLER( paletteram32_xBBBBBGGGGGRRRRR_dword_w )
{
paletteram16 = (UINT16 *)paletteram32;
if (ACCESSING_MSW32) paletteram16_xBBBBBGGGGGRRRRR_word_w(machine, offset*2, data >> 16, mem_mask >> 16);
if (ACCESSING_LSW32) paletteram16_xBBBBBGGGGGRRRRR_word_w(machine, offset*2+1, data, mem_mask);
if (ACCESSING_WORD_1) paletteram16_xBBBBBGGGGGRRRRR_word_w(machine, offset*2, data >> 16, mem_mask >> 16);
if (ACCESSING_WORD_0) paletteram16_xBBBBBGGGGGRRRRR_word_w(machine, offset*2+1, data, mem_mask);
}
static UINT32 input_sel;
static WRITE32_HANDLER( darkhors_input_sel_w )
{
COMBINE_DATA(&input_sel);
// if (ACCESSING_MSW32) popmessage("%04X",data >> 16);
// if (ACCESSING_WORD_1) popmessage("%04X",data >> 16);
}
static int mask_to_bit( int mask )
@ -309,7 +309,7 @@ static READ32_HANDLER( darkhors_input_sel_r )
static WRITE32_HANDLER( darkhors_unk1_w )
{
// 0x1000 lockout
// if (ACCESSING_MSW32) popmessage("%04X",data >> 16);
// if (ACCESSING_WORD_1) popmessage("%04X",data >> 16);
}
static ADDRESS_MAP_START( darkhors_readmem, ADDRESS_SPACE_PROGRAM, 32 )

4
src/mame/drivers/dcheese.c
View File

@ -142,7 +142,7 @@ static WRITE16_HANDLER( eeprom_control_w )
{
/* toggles bit $0100 very frequently while waiting for things */
/* bits $0080-$0010 are probably lamps */
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
EEPROM_set_cs_line(~data & 8);
EEPROM_write_bit(data & 2);
@ -154,7 +154,7 @@ static WRITE16_HANDLER( eeprom_control_w )
static WRITE16_HANDLER( sound_command_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
/* write the latch and set the IRQ */
soundlatch_full = 1;

42
src/mame/drivers/ddenlovr.c
View File

@ -224,7 +224,7 @@ static WRITE8_HANDLER( ddenlovr_bgcolor2_w )
static WRITE16_HANDLER( ddenlovr16_bgcolor_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
ddenlovr_bgcolor_w(machine,offset,data);
}
@ -241,7 +241,7 @@ static WRITE8_HANDLER( ddenlovr_priority2_w )
static WRITE16_HANDLER( ddenlovr16_priority_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
ddenlovr_priority_w(machine,offset,data);
}
@ -259,7 +259,7 @@ static WRITE8_HANDLER( ddenlovr_layer_enable2_w )
static WRITE16_HANDLER( ddenlovr16_layer_enable_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
ddenlovr_layer_enable_w(machine,offset,data);
}
@ -1119,14 +1119,14 @@ static WRITE8_HANDLER( rongrong_blitter_w )
static WRITE16_HANDLER( ddenlovr_blitter_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
blitter_w(machine, 0,offset,data & 0xff,0);
}
static WRITE16_HANDLER( ddenlovr_blitter_irq_ack_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
if (data & 1)
{
@ -1312,12 +1312,12 @@ static READ16_HANDLER( ddenlovr_special_r )
static WRITE16_HANDLER( ddenlovr_coincounter_0_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
coin_counter_w(0, data & 1);
}
static WRITE16_HANDLER( ddenlovr_coincounter_1_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
coin_counter_w(1, data & 1);
}
@ -1344,7 +1344,7 @@ static WRITE8_HANDLER( rongrong_palette_w )
static WRITE16_HANDLER( ddenlovr_palette_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
rongrong_palette_w(machine,offset,data & 0xff);
}
@ -1388,25 +1388,25 @@ static WRITE8_HANDLER( ddenlovr_transparency_mask2_w )
static WRITE16_HANDLER( ddenlovr16_palette_base_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
ddenlovr_palette_base[offset] = data & 0xff;
}
static WRITE16_HANDLER( ddenlovr16_palette_mask_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
ddenlovr_palette_mask[offset] = data & 0xff;
}
static WRITE16_HANDLER( ddenlovr16_transparency_pen_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
ddenlovr_transparency_pen[offset] = data & 0xff;
}
static WRITE16_HANDLER( ddenlovr16_transparency_mask_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
ddenlovr_transparency_mask[offset] = data & 0xff;
}
@ -1418,7 +1418,7 @@ static WRITE8_HANDLER( quizchq_oki_bank_w )
static WRITE16_HANDLER( ddenlovr_oki_bank_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
OKIM6295_set_bank_base(0, (data & 7) * 0x40000);
}
@ -1427,7 +1427,7 @@ static int okibank;
static WRITE16_HANDLER( quiz365_oki_bank1_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
okibank = (okibank & 2) | (data & 1);
OKIM6295_set_bank_base(0, okibank * 0x40000);
@ -1436,7 +1436,7 @@ static WRITE16_HANDLER( quiz365_oki_bank1_w )
static WRITE16_HANDLER( quiz365_oki_bank2_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
okibank = (okibank & 1) | ((data & 1) << 1);
OKIM6295_set_bank_base(0, okibank * 0x40000);
@ -1465,7 +1465,7 @@ static WRITE8_HANDLER( ddenlovr_select_w )
static WRITE16_HANDLER( ddenlovr_select_16_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
ddenlovr_select = data;
}
@ -1476,7 +1476,7 @@ static WRITE8_HANDLER( ddenlovr_select2_w )
static WRITE16_HANDLER( ddenlovr_select2_16_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
ddenlovr_select2 = data;
}
@ -1540,7 +1540,7 @@ static READ8_HANDLER( rongrong_blitter_busy_r )
static WRITE16_HANDLER( quiz365_coincounter_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
if (ddenlovr_select2 == 0x1c)
{
@ -1623,7 +1623,7 @@ static READ16_HANDLER( ddenlvrj_dsw_r )
static WRITE16_HANDLER( ddenlvrj_coincounter_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
coin_counter_w(0, data & 0x01);
coin_counter_w(1, data & 0x04);
@ -1749,7 +1749,7 @@ static READ16_HANDLER( nettoqc_protection_r )
static WRITE16_HANDLER( nettoqc_coincounter_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
coin_counter_w(0, data & 0x01);
coin_counter_w(1, data & 0x04);
@ -1759,7 +1759,7 @@ static WRITE16_HANDLER( nettoqc_coincounter_w )
static WRITE16_HANDLER( nettoqc_oki_bank_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
OKIM6295_set_bank_base(0, (data & 3) * 0x40000);
}

6
src/mame/drivers/dec0.c
View File

@ -65,7 +65,7 @@ static WRITE16_HANDLER( dec0_control_w )
break;
case 4: /* 6502 sound cpu */
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
soundlatch_w(machine,0,data & 0xff);
cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE);
@ -101,7 +101,7 @@ static WRITE16_HANDLER( slyspy_control_w )
{
switch (offset<<1) {
case 0:
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
soundlatch_w(machine,0,data & 0xff);
cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE);
@ -115,7 +115,7 @@ static WRITE16_HANDLER( slyspy_control_w )
static WRITE16_HANDLER( midres_sound_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
soundlatch_w(machine,0,data & 0xff);
cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE);

4
src/mame/drivers/deco156.c
View File

@ -158,7 +158,7 @@ static READ32_HANDLER(hvysmsh_eeprom_r)
static WRITE32_HANDLER(hvysmsh_eeprom_w)
{
if (ACCESSING_LSB32) {
if (ACCESSING_BYTE_0) {
OKIM6295_set_bank_base(1, 0x40000 * (data & 0x7) );
@ -201,7 +201,7 @@ static READ32_HANDLER(wcvol95_eeprom_r)
static WRITE32_HANDLER(wcvol95_eeprom_w)
{
if (ACCESSING_LSB32) {
if (ACCESSING_BYTE_0) {
EEPROM_set_clock_line((data & 0x2) ? ASSERT_LINE : CLEAR_LINE);
EEPROM_write_bit(data & 0x1);
EEPROM_set_cs_line((data & 0x4) ? CLEAR_LINE : ASSERT_LINE);

8
src/mame/drivers/deco32.c
View File

@ -359,12 +359,12 @@ static READ32_HANDLER( fghthist_control_r )
static WRITE32_HANDLER( fghthist_eeprom_w )
{
if (ACCESSING_LSB32) {
if (ACCESSING_BYTE_0) {
EEPROM_set_clock_line((data & 0x20) ? ASSERT_LINE : CLEAR_LINE);
EEPROM_write_bit(data & 0x10);
EEPROM_set_cs_line((data & 0x40) ? CLEAR_LINE : ASSERT_LINE);
}
else if (mem_mask&0x0000ff00)
else if (!ACCESSING_BYTE_1)
{
// Volume port
}
@ -434,7 +434,7 @@ static READ32_HANDLER( dragngun_eeprom_r )
static WRITE32_HANDLER( dragngun_eeprom_w )
{
if (ACCESSING_LSB32) {
if (ACCESSING_BYTE_0) {
EEPROM_set_clock_line((data & 0x2) ? ASSERT_LINE : CLEAR_LINE);
EEPROM_write_bit(data & 0x1);
EEPROM_set_cs_line((data & 0x4) ? CLEAR_LINE : ASSERT_LINE);
@ -635,7 +635,7 @@ static READ32_HANDLER( nslasher_prot_r )
static WRITE32_HANDLER( nslasher_eeprom_w )
{
if (ACCESSING_LSB32)
if (ACCESSING_BYTE_0)
{
EEPROM_set_clock_line((data & 0x20) ? ASSERT_LINE : CLEAR_LINE);
EEPROM_write_bit(data & 0x10);

8
src/mame/drivers/deniam.c
View File

@ -54,7 +54,7 @@ VIDEO_UPDATE( deniam );
static WRITE16_HANDLER( sound_command_w )
{
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
{
soundlatch_w(machine,offset,(data >> 8) & 0xff);
cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE);
@ -68,7 +68,7 @@ static WRITE8_HANDLER( deniam16b_oki_rom_bank_w )
static WRITE16_HANDLER( deniam16c_oki_rom_bank_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
OKIM6295_set_bank_base(0,(data & 0x01) ? 0x40000 : 0x00000);
}
@ -80,13 +80,13 @@ static MACHINE_RESET( deniam )
static WRITE16_HANDLER( YM3812_control_port_0_msb_w )
{
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
YM3812_control_port_0_w(machine,0,(data >> 8) & 0xff);
}
static WRITE16_HANDLER( YM3812_write_port_0_msb_w )
{
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
YM3812_write_port_0_w(machine,0,(data >> 8) & 0xff);
}

2
src/mame/drivers/dgpix.c
View File

@ -121,7 +121,7 @@ static WRITE32_HANDLER( flash_w )
// write game settings
if(ACCESSING_LSW32)
if(ACCESSING_WORD_0)
rom[BYTE_XOR_BE(offset*2 + 1)] = data & 0xffff;
else
rom[BYTE_XOR_BE(offset*2 + 0)] = (data & 0xffff0000) >> 16;

2
src/mame/drivers/diverboy.c
View File

@ -59,7 +59,7 @@ VIDEO_UPDATE(diverboy);
static WRITE16_HANDLER( soundcmd_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
soundlatch_w(machine,0,data & 0xff);
cpunum_set_input_line(machine, 1,0,HOLD_LINE);

54
src/mame/drivers/djmain.c
View File

@ -96,7 +96,7 @@ static void sndram_set_bank(void)
static WRITE32_HANDLER( sndram_bank_w )
{
if (ACCESSING_MSW32)
if (ACCESSING_WORD_1)
{
sndram_bank = (data >> 16) & 0x1f;
sndram_set_bank();
@ -107,16 +107,16 @@ static READ32_HANDLER( sndram_r )
{
UINT32 data = 0;
if ((mem_mask & 0xff000000) == 0)
if (ACCESSING_BYTE_3)
data |= sndram[offset * 4] << 24;
if ((mem_mask & 0x00ff0000) == 0)
if (ACCESSING_BYTE_2)
data |= sndram[offset * 4 + 1] << 16;
if ((mem_mask & 0x0000ff00) == 0)
if (ACCESSING_BYTE_1)
data |= sndram[offset * 4 + 2] << 8;
if ((mem_mask & 0x000000ff) == 0)
if (ACCESSING_BYTE_0)
data |= sndram[offset * 4 + 3];
return data;
@ -124,16 +124,16 @@ static READ32_HANDLER( sndram_r )
static WRITE32_HANDLER( sndram_w )
{
if ((mem_mask & 0xff000000) == 0)
if (ACCESSING_BYTE_3)
sndram[offset * 4] = data >> 24;
if ((mem_mask & 0x00ff0000) == 0)
if (ACCESSING_BYTE_2)
sndram[offset * 4 + 1] = data >> 16;
if ((mem_mask & 0x0000ff00) == 0)
if (ACCESSING_BYTE_1)
sndram[offset * 4 + 2] = data >> 8;
if ((mem_mask & 0x000000ff) == 0)
if (ACCESSING_BYTE_0)
sndram[offset * 4 + 3] = data;
}
@ -144,9 +144,9 @@ static READ16_HANDLER( dual539_16_r )
{
UINT16 ret = 0;
if (ACCESSING_LSB16)
if (ACCESSING_BYTE_0)
ret |= K054539_1_r(machine, offset);
if (ACCESSING_MSB16)
if (ACCESSING_BYTE_1)
ret |= K054539_0_r(machine, offset)<<8;
return ret;
@ -154,9 +154,9 @@ static READ16_HANDLER( dual539_16_r )
static WRITE16_HANDLER( dual539_16_w )
{
if (ACCESSING_LSB16)
if (ACCESSING_BYTE_0)
K054539_1_w(machine, offset, data);
if (ACCESSING_MSB16)
if (ACCESSING_BYTE_1)
K054539_0_w(machine, offset, data>>8);
}
@ -164,9 +164,9 @@ static READ32_HANDLER( dual539_r )
{
UINT32 data = 0;
if (~mem_mask & 0xffff0000)
if (ACCESSING_WORD_1)
data |= dual539_16_r(machine, offset * 2, mem_mask >> 16) << 16;
if (~mem_mask & 0x0000ffff)
if (ACCESSING_WORD_0)
data |= dual539_16_r(machine, offset * 2 + 1, mem_mask);
return data;
@ -174,9 +174,9 @@ static READ32_HANDLER( dual539_r )
static WRITE32_HANDLER( dual539_w )
{
if (~mem_mask & 0xffff0000)
if (ACCESSING_WORD_1)
dual539_16_w(machine, offset * 2, data >> 16, mem_mask >> 16);
if (~mem_mask & 0x0000ffff)
if (ACCESSING_WORD_0)
dual539_16_w(machine, offset * 2 + 1, data, mem_mask);
}
@ -206,7 +206,7 @@ static READ32_HANDLER( obj_rom_r )
offset += bank * 0x200;
offset *= 4;
if (~mem_mask & 0x0000ffff)
if (ACCESSING_WORD_0)
offset += 2;
if (~mem_mask & 0xff00ff00)
@ -220,7 +220,7 @@ static READ32_HANDLER( obj_rom_r )
static WRITE32_HANDLER( v_ctrl_w )
{
if (ACCESSING_MSW32)
if (ACCESSING_WORD_1)
{
data >>= 16;
mem_mask >>= 16;
@ -241,7 +241,7 @@ static READ32_HANDLER( v_rom_r )
offset *= 2;
if (!ACCESSING_MSB32)
if (!ACCESSING_BYTE_3)
offset += 1;
offset += bank * 0x800 * 4;
@ -271,7 +271,7 @@ static READ32_HANDLER( turntable_r )
{
UINT32 result = 0;
if (!(mem_mask & 0x0000ff00))
if (ACCESSING_BYTE_1)
{
UINT8 pos;
int delta;
@ -294,7 +294,7 @@ static READ32_HANDLER( turntable_r )
static WRITE32_HANDLER( turntable_select_w )
{
if (!(mem_mask & 0x00ff0000))
if (ACCESSING_BYTE_2)
turntable_select = (data >> 19) & 1;
}
@ -306,7 +306,7 @@ static WRITE32_HANDLER( turntable_select_w )
static READ32_HANDLER( ide_std_r )
{
if (ACCESSING_LSB32)
if (ACCESSING_BYTE_0)
return ide_controller16_0_r(machine, IDE_STD_OFFSET + offset, 0x00ff) >> 8;
else
return ide_controller16_0_r(machine, IDE_STD_OFFSET + offset, 0x0000) << 16;
@ -314,7 +314,7 @@ static READ32_HANDLER( ide_std_r )
static WRITE32_HANDLER( ide_std_w )
{
if (ACCESSING_LSB32)
if (ACCESSING_BYTE_0)
ide_controller16_0_w(machine, IDE_STD_OFFSET + offset, data << 8, 0x00ff);
else
ide_controller16_0_w(machine, IDE_STD_OFFSET + offset, data >> 16, 0x0000);
@ -331,7 +331,7 @@ static READ32_HANDLER( ide_alt_r )
static WRITE32_HANDLER( ide_alt_w )
{
if (offset == 0 && !(mem_mask & 0x00ff0000))
if (offset == 0 && ACCESSING_BYTE_2)
ide_controller16_0_w(machine, IDE_ALT_OFFSET, data >> 24, 0xff00);
}
@ -371,7 +371,7 @@ static WRITE32_HANDLER( ide_alt_w )
static WRITE32_HANDLER( light_ctrl_1_w )
{
if (ACCESSING_MSW32)
if (ACCESSING_WORD_1)
{
output_set_value("right-red-hlt", !(data & 0x08000000)); // Right red HIGHLIGHT
output_set_value("left-red-hlt", !(data & 0x04000000)); // Left red HIGHLIGHT
@ -382,7 +382,7 @@ static WRITE32_HANDLER( light_ctrl_1_w )
static WRITE32_HANDLER( light_ctrl_2_w )
{
if (ACCESSING_MSW32)
if (ACCESSING_WORD_1)
{
output_set_value("left-ssr", !!(data & 0x08000000)); // SSR
output_set_value("right-ssr", !!(data & 0x08000000)); // SSR

8
src/mame/drivers/dreamwld.c
View File

@ -226,7 +226,7 @@ static READ32_HANDLER(dreamwld_6295_0_r)
static WRITE32_HANDLER(dreamwld_6295_0_w)
{
if (!(mem_mask & 0xff000000))
if (ACCESSING_BYTE_3)
{
OKIM6295_data_0_w(machine, 0, (data>>24) & 0xff);
}
@ -248,7 +248,7 @@ static void dreamwld_oki_setbank( UINT8 chip, UINT8 bank )
static WRITE32_HANDLER( dreamwld_6295_0_bank_w )
{
if (!(mem_mask & 0x000000ff))
if (ACCESSING_BYTE_0)
{
dreamwld_oki_setbank(0,data&0x3);
}
@ -265,7 +265,7 @@ static READ32_HANDLER(dreamwld_6295_1_r)
static WRITE32_HANDLER(dreamwld_6295_1_w)
{
if (!(mem_mask & 0xff000000))
if (ACCESSING_BYTE_3)
{
OKIM6295_data_1_w(machine, 0, (data>>24) & 0xff);
}
@ -277,7 +277,7 @@ static WRITE32_HANDLER(dreamwld_6295_1_w)
static WRITE32_HANDLER( dreamwld_6295_1_bank_w )
{
if (!(mem_mask & 0x000000ff))
if (ACCESSING_BYTE_0)
{
dreamwld_oki_setbank(1,data&0x3);
}

4
src/mame/drivers/drgnmst.c
View File

@ -45,7 +45,7 @@ static WRITE16_HANDLER( drgnmst_coin_w )
static WRITE16_HANDLER( drgnmst_snd_command_w )
{
if (ACCESSING_LSB) {
if (ACCESSING_BYTE_0) {
drgnmst_snd_command = (data & 0xff);
cpu_yield();
}
@ -54,7 +54,7 @@ static WRITE16_HANDLER( drgnmst_snd_command_w )
static WRITE16_HANDLER( drgnmst_snd_flag_w )
{
/* Enables the following 68K write operation to latch through to the PIC */
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
drgnmst_snd_flag = 1;
}

2
src/mame/drivers/eprom.c
View File

@ -119,7 +119,7 @@ static READ16_HANDLER( adc_r )
static WRITE16_HANDLER( eprom_latch_w )
{
/* reset extra CPU */
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
if (data & 1)
cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, CLEAR_LINE);

2
src/mame/drivers/equites.c
View File

@ -685,7 +685,7 @@ static READ16_HANDLER(mcu_r)
static WRITE16_HANDLER(mcu_w)
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
mcu_ram[offset] = data & 0xff;
}

12
src/mame/drivers/ertictac.c
View File

@ -63,7 +63,7 @@ static READ32_HANDLER(IRQRQA_r)
static WRITE32_HANDLER(IRQRQA_w)
{
if(ACCESSING_LSB32)
if(ACCESSING_BYTE_0)
IRQSTA&=~data;
}
@ -74,7 +74,7 @@ static READ32_HANDLER(IRQMSKA_r)
static WRITE32_HANDLER(IRQMSKA_w)
{
if(ACCESSING_LSB32)
if(ACCESSING_BYTE_0)
IRQMSKA=(data&(~2))|0x80;
}
@ -90,7 +90,7 @@ static READ32_HANDLER(IRQMSKB_r)
static WRITE32_HANDLER(IRQMSKB_w)
{
if(ACCESSING_LSB32)
if(ACCESSING_BYTE_0)
IRQMSKB=data;
}
@ -101,7 +101,7 @@ static READ32_HANDLER(FIQMSK_r)
static WRITE32_HANDLER(FIQMSK_w)
{
if(ACCESSING_LSB32)
if(ACCESSING_BYTE_0)
FIQMSK=(data&(~0x2c))|0x80;
}
@ -112,7 +112,7 @@ static READ32_HANDLER(T1low_r)
static WRITE32_HANDLER(T1low_w)
{
if(ACCESSING_LSB32)
if(ACCESSING_BYTE_0)
T1low=data;
}
@ -123,7 +123,7 @@ static READ32_HANDLER(T1high_r)
static WRITE32_HANDLER(T1high_w)
{
if(ACCESSING_LSB32)
if(ACCESSING_BYTE_0)
T1high=data;
}

6
src/mame/drivers/esd16.c
View File

@ -68,7 +68,7 @@ static WRITE16_HANDLER( esd16_spriteram_w ) { COMBINE_DATA(&spriteram16[offset])
static WRITE16_HANDLER( esd16_sound_command_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
soundlatch_w(machine,0,data & 0xff);
cpunum_set_input_line(machine, 1,0,ASSERT_LINE); // Generate an IRQ
@ -129,7 +129,7 @@ static WRITE16_HANDLER(hedpanic_platform_w)
static READ16_HANDLER( esd_eeprom_r )
{
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
{
return ((EEPROM_read_bit() & 0x01) << 15);
}
@ -140,7 +140,7 @@ static READ16_HANDLER( esd_eeprom_r )
static WRITE16_HANDLER( esd_eeprom_w )
{
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
{
// data line
EEPROM_write_bit((data & 0x0400) >> 6);

2
src/mame/drivers/expro02.c
View File

@ -228,7 +228,7 @@ static WRITE16_HANDLER( galsnew_paletteram_w )
static WRITE16_HANDLER( galsnew_6295_bankswitch_w )
{
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
{
UINT8 *rom = memory_region(REGION_SOUND1);
memcpy(&rom[0x30000],&rom[0x40000 + ((data >> 8) & 0x0f) * 0x10000],0x10000);

6
src/mame/drivers/exterm.c
View File

@ -187,7 +187,7 @@ static WRITE16_HANDLER( exterm_output_port_0_w )
/* All the outputs are activated on the rising edge */
static UINT16 last = 0;
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
/* Bit 0-1= Resets analog controls */
if ((data & 0x0001) && !(last & 0x0001))
@ -196,7 +196,7 @@ static WRITE16_HANDLER( exterm_output_port_0_w )
aimpos[1] = 0;
}
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
{
/* Bit 13 = Resets the slave CPU */
if ((data & 0x2000) && !(last & 0x2000))
@ -222,7 +222,7 @@ static TIMER_CALLBACK( sound_delayed_w )
static WRITE16_HANDLER( sound_latch_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
timer_call_after_resynch(NULL, data & 0xff, sound_delayed_w);
}

2
src/mame/drivers/f1gp.c
View File

@ -69,7 +69,7 @@ static int pending_command;
static WRITE16_HANDLER( sound_command_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
pending_command = 1;
soundlatch_w(machine,offset,data & 0xff);

12
src/mame/drivers/fantland.c
View File

@ -70,7 +70,7 @@ static WRITE8_HANDLER( fantland_nmi_enable_w )
static WRITE16_HANDLER( fantland_nmi_enable_16_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
fantland_nmi_enable_w(machine,offset*2,data);
}
@ -82,7 +82,7 @@ static WRITE8_HANDLER( fantland_soundlatch_w )
static WRITE16_HANDLER( fantland_soundlatch_16_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
fantland_soundlatch_w(machine, offset*2, data);
}
@ -102,17 +102,17 @@ static READ16_HANDLER( spriteram2_16_r )
static WRITE16_HANDLER( spriteram_16_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
spriteram[2*offset+0] = data;
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
spriteram[2*offset+1] = data >> 8;
}
static WRITE16_HANDLER( spriteram2_16_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
spriteram_2[2*offset+0] = data;
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
spriteram_2[2*offset+1] = data >> 8;
}

122
src/mame/drivers/firebeat.c
View File

@ -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_LSW32)
if (ACCESSING_WORD_0)
{
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 (!(mem_mask & 0xff000000))
if (ACCESSING_BYTE_3)
{
r |= (readinputport(0) & 0xff) << 24;
}
if (!(mem_mask & 0x0000ff00))
if (ACCESSING_BYTE_1)
{
r |= (readinputport(1) & 0xff) << 8;
}
if (!(mem_mask & 0x000000ff))
if (ACCESSING_BYTE_0)
{
r |= (readinputport(2) & 0xff);
}
@ -703,19 +703,19 @@ static READ32_HANDLER( sensor_r )
static READ32_HANDLER(flashram_r)
{
UINT32 r = 0;
if (!(mem_mask & 0xff000000))
if (ACCESSING_BYTE_3)
{
r |= (intelflash_read(0, (offset*4)+0) & 0xff) << 24;
}
if (!(mem_mask & 0x00ff0000))
if (ACCESSING_BYTE_2)
{
r |= (intelflash_read(0, (offset*4)+1) & 0xff) << 16;
}
if (!(mem_mask & 0x0000ff00))
if (ACCESSING_BYTE_1)
{
r |= (intelflash_read(0, (offset*4)+2) & 0xff) << 8;
}
if (!(mem_mask & 0x000000ff))
if (ACCESSING_BYTE_0)
{
r |= (intelflash_read(0, (offset*4)+3) & 0xff) << 0;
}
@ -724,19 +724,19 @@ static READ32_HANDLER(flashram_r)
static WRITE32_HANDLER(flashram_w)
{
if (!(mem_mask & 0xff000000))
if (ACCESSING_BYTE_3)
{
intelflash_write(0, (offset*4)+0, (data >> 24) & 0xff);
}
if (!(mem_mask & 0x00ff0000))
if (ACCESSING_BYTE_2)
{
intelflash_write(0, (offset*4)+1, (data >> 16) & 0xff);
}
if (!(mem_mask & 0x0000ff00))
if (ACCESSING_BYTE_1)
{
intelflash_write(0, (offset*4)+2, (data >> 8) & 0xff);
}
if (!(mem_mask & 0x000000ff))
if (ACCESSING_BYTE_0)
{
intelflash_write(0, (offset*4)+3, (data >> 0) & 0xff);
}
@ -757,19 +757,19 @@ static READ32_HANDLER(soundflash_r)
offset &= 0x7ffff;
if (!(mem_mask & 0xff000000))
if (ACCESSING_BYTE_3)
{
r |= (intelflash_read(chip, (offset*4)+0) & 0xff) << 24;
}
if (!(mem_mask & 0x00ff0000))
if (ACCESSING_BYTE_2)
{
r |= (intelflash_read(chip, (offset*4)+1) & 0xff) << 16;
}
if (!(mem_mask & 0x0000ff00))
if (ACCESSING_BYTE_1)
{
r |= (intelflash_read(chip, (offset*4)+2) & 0xff) << 8;
}
if (!(mem_mask & 0x000000ff))
if (ACCESSING_BYTE_0)
{
r |= (intelflash_read(chip, (offset*4)+3) & 0xff) << 0;
}
@ -790,19 +790,19 @@ static WRITE32_HANDLER(soundflash_w)
offset &= 0x7ffff;
if (!(mem_mask & 0xff000000))
if (ACCESSING_BYTE_3)
{
intelflash_write(chip, (offset*4)+0, (data >> 24) & 0xff);
}
if (!(mem_mask & 0x00ff0000))
if (ACCESSING_BYTE_2)
{
intelflash_write(chip, (offset*4)+1, (data >> 16) & 0xff);
}
if (!(mem_mask & 0x0000ff00))
if (ACCESSING_BYTE_1)
{
intelflash_write(chip, (offset*4)+2, (data >> 8) & 0xff);
}
if (!(mem_mask & 0x000000ff))
if (ACCESSING_BYTE_0)
{
intelflash_write(chip, (offset*4)+3, (data >> 0) & 0xff);
}
@ -1222,19 +1222,19 @@ static READ32_HANDLER( comm_uart_r )
{
UINT32 r = 0;
if (!(mem_mask & 0xff000000))
if (ACCESSING_BYTE_3)
{
r |= pc16552d_0_r(machine, (offset*4)+0) << 24;
}
if (!(mem_mask & 0x00ff0000))
if (ACCESSING_BYTE_2)
{
r |= pc16552d_0_r(machine, (offset*4)+1) << 16;
}
if (!(mem_mask & 0x0000ff00))
if (ACCESSING_BYTE_1)
{
r |= pc16552d_0_r(machine, (offset*4)+2) << 8;
}
if (!(mem_mask & 0x000000ff))
if (ACCESSING_BYTE_0)
{
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 (!(mem_mask & 0xff000000))
if (ACCESSING_BYTE_3)
{
pc16552d_0_w(machine, (offset*4)+0, (data >> 24) & 0xff);
}
if (!(mem_mask & 0x00ff0000))
if (ACCESSING_BYTE_2)
{
pc16552d_0_w(machine, (offset*4)+1, (data >> 16) & 0xff);
}
if (!(mem_mask & 0x0000ff00))
if (ACCESSING_BYTE_1)
{
pc16552d_0_w(machine, (offset*4)+2, (data >> 8) & 0xff);
}
if (!(mem_mask & 0x000000ff))
if (ACCESSING_BYTE_0)
{
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 (!(mem_mask & 0xff000000))
if (ACCESSING_BYTE_3)
{
r |= rtc65271_r((reg >> 8) & 0x1, (reg & 0xff) + 0) << 24;
}
if (!(mem_mask & 0x00ff0000))
if (ACCESSING_BYTE_2)
{
r |= rtc65271_r((reg >> 8) & 0x1, (reg & 0xff) + 1) << 16;
}
if (!(mem_mask & 0x0000ff00))
if (ACCESSING_BYTE_1)
{
r |= rtc65271_r((reg >> 8) & 0x1, (reg & 0xff) + 2) << 8;
}
if (!(mem_mask & 0x000000ff))
if (ACCESSING_BYTE_0)
{
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 (!(mem_mask & 0xff000000))
if (ACCESSING_BYTE_3)
{
rtc65271_w((reg >> 8) & 0x1, (reg & 0xff) + 0, (data >> 24) & 0xff);
}
if (!(mem_mask & 0x00ff0000))
if (ACCESSING_BYTE_2)
{
rtc65271_w((reg >> 8) & 0x1, (reg & 0xff) + 1, (data >> 16) & 0xff);
}
if (!(mem_mask & 0x0000ff00))
if (ACCESSING_BYTE_1)
{
rtc65271_w((reg >> 8) & 0x1, (reg & 0xff) + 2, (data >> 8) & 0xff);
}
if (!(mem_mask & 0x000000ff))
if (ACCESSING_BYTE_0)
{
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 (!(mem_mask & 0xff000000)) /* External RAM read */
if (ACCESSING_BYTE_3) /* External RAM read */
{
r |= YMZ280B_data_0_r(machine, offset) << 24;
}
if (!(mem_mask & 0x00ff0000))
if (ACCESSING_BYTE_2)
{
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 (!(mem_mask & 0xff000000))
if (ACCESSING_BYTE_3)
{
YMZ280B_register_0_w(machine, offset, (data >> 24) & 0xff);
}
if (!(mem_mask & 0x00ff0000))
if (ACCESSING_BYTE_2)
{
YMZ280B_data_0_w(machine, offset, (data >> 16) & 0xff);
}
@ -1397,7 +1397,7 @@ static READ32_HANDLER( midi_uart_r )
{
UINT32 r = 0;
if (!(mem_mask & 0xff000000))
if (ACCESSING_BYTE_3)
{
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 (!(mem_mask & 0xff000000))
if (ACCESSING_BYTE_3)
{
pc16552d_1_w(machine, offset >> 6, (data >> 24) & 0xff);
}
@ -1518,7 +1518,7 @@ static READ32_HANDLER( extend_board_irq_r)
{
UINT32 r = 0;
if (!(mem_mask & 0xff000000))
if (ACCESSING_BYTE_3)
{
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 (!(mem_mask & 0xff000000))
if (ACCESSING_BYTE_3)
{
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 (!(mem_mask & 0x000000ff))
if (ACCESSING_BYTE_0)
{
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 (!(mem_mask & 0xff000000))
if (ACCESSING_BYTE_3)
{
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 (!(mem_mask & 0x0000ff00))
if (ACCESSING_BYTE_1)
{
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 (!(mem_mask & 0x0000ff00))
if (ACCESSING_BYTE_1)
{
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 (!(mem_mask & 0xff000000))
if (ACCESSING_BYTE_3)
{
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 (!(mem_mask & 0x00ff0000))
if (ACCESSING_BYTE_2)
{
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 (!(mem_mask & 0x00ff0000))
if (ACCESSING_BYTE_2)
{
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 (!(mem_mask & 0x000000ff))
if (ACCESSING_BYTE_0)
{
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 (!(mem_mask & 0x00ff0000))
if (ACCESSING_BYTE_2)
{
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 (!(mem_mask & 0xff000000))
if (ACCESSING_BYTE_3)
{
r |= spu_shared_ram[(offset * 4) + 0] << 24;
}
if (!(mem_mask & 0x00ff0000))
if (ACCESSING_BYTE_2)
{
r |= spu_shared_ram[(offset * 4) + 1] << 16;
}
if (!(mem_mask & 0x0000ff0000))
if (ACCESSING_BYTE_1)
{
r |= spu_shared_ram[(offset * 4) + 2] << 8;
}
if (!(mem_mask & 0xff000000))
if (ACCESSING_BYTE_0)
{
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 (!(mem_mask & 0xff000000))
if (ACCESSING_BYTE_3)
{
spu_shared_ram[(offset * 4) + 0] = (data >> 24) & 0xff;
}
if (!(mem_mask & 0x00ff0000))
if (ACCESSING_BYTE_2)
{
spu_shared_ram[(offset * 4) + 1] = (data >> 16) & 0xff;
}
if (!(mem_mask & 0x0000ff00))
if (ACCESSING_BYTE_1)
{
spu_shared_ram[(offset * 4) + 2] = (data >> 8) & 0xff;
}
if (!(mem_mask & 0x000000ff))
if (ACCESSING_BYTE_0)
{
spu_shared_ram[(offset * 4) + 3] = (data >> 0) & 0xff;
}

8
src/mame/drivers/foodf.c
View File

@ -173,7 +173,7 @@ static MACHINE_RESET( foodf )
static WRITE16_HANDLER( digital_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
foodf_set_flip(data & 0x01);
@ -223,9 +223,9 @@ static READ16_HANDLER( pokey1_word_r ) { return pokey1_r(machine, offset); }
static READ16_HANDLER( pokey2_word_r ) { return pokey2_r(machine, offset); }
static READ16_HANDLER( pokey3_word_r ) { return pokey3_r(machine, offset); }
static WRITE16_HANDLER( pokey1_word_w ) { if (ACCESSING_LSB) pokey1_w(machine, offset, data & 0xff); }
static WRITE16_HANDLER( pokey2_word_w ) { if (ACCESSING_LSB) pokey2_w(machine, offset, data & 0xff); }
static WRITE16_HANDLER( pokey3_word_w ) { if (ACCESSING_LSB) pokey3_w(machine, offset, data & 0xff); }
static WRITE16_HANDLER( pokey1_word_w ) { if (ACCESSING_BYTE_0) pokey1_w(machine, offset, data & 0xff); }
static WRITE16_HANDLER( pokey2_word_w ) { if (ACCESSING_BYTE_0) pokey2_w(machine, offset, data & 0xff); }
static WRITE16_HANDLER( pokey3_word_w ) { if (ACCESSING_BYTE_0) pokey3_w(machine, offset, data & 0xff); }

6
src/mame/drivers/fromanc2.c
View File

@ -194,7 +194,7 @@ static READ16_HANDLER( fromanc4_input_r )
static WRITE16_HANDLER( fromanc2_eeprom_w )
{
if (ACCESSING_MSB) {
if (ACCESSING_BYTE_1) {
// latch the bit
EEPROM_write_bit(data & 0x0100);
@ -208,7 +208,7 @@ static WRITE16_HANDLER( fromanc2_eeprom_w )
static WRITE16_HANDLER( fromancr_eeprom_w )
{
if (ACCESSING_LSB) {
if (ACCESSING_BYTE_0) {
fromancr_gfxbank_w(data & 0xfff8);
// latch the bit
@ -224,7 +224,7 @@ static WRITE16_HANDLER( fromancr_eeprom_w )
static WRITE16_HANDLER( fromanc4_eeprom_w )
{
if (ACCESSING_LSB) {
if (ACCESSING_BYTE_0) {
// latch the bit
EEPROM_write_bit(data & 0x0004);

2
src/mame/drivers/fuukifg2.c
View File

@ -78,7 +78,7 @@ static WRITE16_HANDLER( fuuki16_vregs_w )
static WRITE16_HANDLER( fuuki16_sound_command_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
soundlatch_w(machine,0,data & 0xff);
cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);

8
src/mame/drivers/fuukifg3.c
View File

@ -186,7 +186,7 @@ VIDEO_EOF( fuuki32 );
static WRITE32_HANDLER( paletteram32_xRRRRRGGGGGBBBBB_dword_w )
{
if(ACCESSING_MSW32)
if(ACCESSING_WORD_1)
{
int r,g,b;
COMBINE_DATA(&paletteram32[offset]);
@ -198,7 +198,7 @@ static WRITE32_HANDLER( paletteram32_xRRRRRGGGGGBBBBB_dword_w )
palette_set_color_rgb(Machine,offset*2,pal5bit(r),pal5bit(g),pal5bit(b));
}
if(ACCESSING_LSW32)
if(ACCESSING_WORD_0)
{
int r,g,b;
COMBINE_DATA(&paletteram32[offset]);
@ -241,12 +241,12 @@ static READ32_HANDLER( snd_020_r )
static WRITE32_HANDLER( snd_020_w )
{
if (!(mem_mask & 0x00ff0000))
if (ACCESSING_BYTE_2)
{
fuuki32_shared_ram[offset*2] = data>>16;
}
if (!(mem_mask & 0x000000ff))
if (ACCESSING_BYTE_0)
{
fuuki32_shared_ram[(offset*2)+1] = data & 0xff;
}

6
src/mame/drivers/gaelco.c
View File

@ -76,7 +76,7 @@ ADDRESS_MAP_END
static WRITE16_HANDLER( bigkarnk_sound_command_w )
{
if (ACCESSING_LSB){
if (ACCESSING_BYTE_0){
soundlatch_w(machine,0,data & 0xff);
cpunum_set_input_line(machine, 1,M6809_FIRQ_LINE,HOLD_LINE);
}
@ -84,7 +84,7 @@ static WRITE16_HANDLER( bigkarnk_sound_command_w )
static WRITE16_HANDLER( bigkarnk_coin_w )
{
if (ACCESSING_LSB){
if (ACCESSING_BYTE_0){
switch ((offset >> 3)){
case 0x00: /* Coin Lockouts */
case 0x01:
@ -302,7 +302,7 @@ static WRITE16_HANDLER( OKIM6295_bankswitch_w )
{
UINT8 *RAM = memory_region(REGION_SOUND1);
if (ACCESSING_LSB){
if (ACCESSING_BYTE_0){
memcpy(&RAM[0x30000], &RAM[0x40000 + (data & 0x0f)*0x10000], 0x10000);
}
}

54
src/mame/drivers/gaelco3d.c
View File

@ -253,7 +253,7 @@ static WRITE16_HANDLER( irq_ack_w )
{
cpunum_set_input_line(Machine, 0, 2, CLEAR_LINE);
}
static WRITE32_HANDLER( irq_ack_020_w ) { if ((mem_mask & 0xffff0000) != 0xffff0000) irq_ack_w(machine, offset, data >> 16, mem_mask >> 16); }
static WRITE32_HANDLER( irq_ack_020_w ) { if (ACCESSING_WORD_1) irq_ack_w(machine, offset, data >> 16, mem_mask >> 16); }
@ -276,26 +276,26 @@ static READ32_HANDLER( eeprom_data_020_r ) { return eeprom_data_r(machine, offse
static WRITE16_HANDLER( eeprom_data_w )
{
if (!(mem_mask & 0xff))
if (ACCESSING_BYTE_0)
EEPROM_write_bit(data & 0x01);
}
static WRITE32_HANDLER( eeprom_data_020_w ) { if ((mem_mask & 0xffff) != 0xffff) eeprom_data_w(machine, offset, data, mem_mask); }
static WRITE32_HANDLER( eeprom_data_020_w ) { if (ACCESSING_WORD_0) eeprom_data_w(machine, offset, data, mem_mask); }
static WRITE16_HANDLER( eeprom_clock_w )
{
if (!(mem_mask & 0xff))
if (ACCESSING_BYTE_0)
EEPROM_set_clock_line((data & 0x01) ? ASSERT_LINE : CLEAR_LINE);
}
static WRITE32_HANDLER( eeprom_clock_020_w ) { if ((mem_mask & 0xffff) != 0xffff) eeprom_clock_w(machine, offset, data, mem_mask); }
static WRITE32_HANDLER( eeprom_clock_020_w ) { if (ACCESSING_WORD_0) eeprom_clock_w(machine, offset, data, mem_mask); }
static WRITE16_HANDLER( eeprom_cs_w )
{
if (!(mem_mask & 0xff))
if (ACCESSING_BYTE_0)
EEPROM_set_cs_line((data & 0x01) ? CLEAR_LINE : ASSERT_LINE);
}
static WRITE32_HANDLER( eeprom_cs_020_w ) { if ((mem_mask & 0xffff) != 0xffff) eeprom_cs_w(machine, offset, data, mem_mask); }
static WRITE32_HANDLER( eeprom_cs_020_w ) { if (ACCESSING_WORD_0) eeprom_cs_w(machine, offset, data, mem_mask); }
@ -316,10 +316,10 @@ static TIMER_CALLBACK( delayed_sound_w )
static WRITE16_HANDLER( sound_data_w )
{
logerror("%06X:sound_data_w(%02X) = %08X & %08X\n", activecpu_get_pc(), offset, data, ~mem_mask);
if (!(mem_mask & 0xff))
if (ACCESSING_BYTE_0)
timer_call_after_resynch(NULL, data & 0xff, delayed_sound_w);
}
static WRITE32_HANDLER( sound_data_020_w ) { if ((mem_mask & 0xffff0000) != 0xffff0000) sound_data_w(machine, offset, data >> 16, mem_mask >> 16); }
static WRITE32_HANDLER( sound_data_020_w ) { if (ACCESSING_WORD_1) sound_data_w(machine, offset, data >> 16, mem_mask >> 16); }
static READ16_HANDLER( sound_data_r )
@ -333,11 +333,11 @@ static READ16_HANDLER( sound_data_r )
static READ16_HANDLER( sound_status_r )
{
logerror("%06X:sound_status_r(%02X) = %02X\n", activecpu_get_pc(), offset, sound_status);
if (!(mem_mask & 0xff))
if (ACCESSING_BYTE_0)
return sound_status;
return 0xffff;
}
static READ32_HANDLER( sound_status_020_r ) { if ((mem_mask & 0x0000ffff) != 0x0000ffff) return sound_status_r(machine, offset, mem_mask); return ~0; }
static READ32_HANDLER( sound_status_020_r ) { if (ACCESSING_WORD_0) return sound_status_r(machine, offset, mem_mask); return ~0; }
static WRITE16_HANDLER( sound_status_w )
@ -370,7 +370,7 @@ static CUSTOM_INPUT( analog_bit_r )
static WRITE16_HANDLER( analog_port_clock_w )
{
/* a zero/one combo is written here to clock the next analog port bit */
if (!(mem_mask & 0xff))
if (ACCESSING_BYTE_0)
{
if (!(data & 0xff))
{
@ -383,13 +383,13 @@ static WRITE16_HANDLER( analog_port_clock_w )
else
logerror("%06X:analog_port_clock_w(%02X) = %08X & %08X\n", activecpu_get_pc(), offset, data, ~mem_mask);
}
static WRITE32_HANDLER( analog_port_clock_020_w ) { if ((mem_mask & 0xffff) != 0xffff) analog_port_clock_w(machine, offset, data, mem_mask); }
static WRITE32_HANDLER( analog_port_clock_020_w ) { if (ACCESSING_WORD_0) analog_port_clock_w(machine, offset, data, mem_mask); }
static WRITE16_HANDLER( analog_port_latch_w )
{
/* a zero is written here to read the analog ports, and a one is written when finished */
if (!(mem_mask & 0xff))
if (ACCESSING_BYTE_0)
{
if (!(data & 0xff))
{
@ -402,7 +402,7 @@ static WRITE16_HANDLER( analog_port_latch_w )
else
logerror("%06X:analog_port_latch_w(%02X) = %08X & %08X\n", activecpu_get_pc(), offset, data, ~mem_mask);
}
static WRITE32_HANDLER( analog_port_latch_020_w ) { if ((mem_mask & 0xffff) != 0xffff) analog_port_latch_w(machine, offset, data, mem_mask); }
static WRITE32_HANDLER( analog_port_latch_020_w ) { if (ACCESSING_WORD_0) analog_port_latch_w(machine, offset, data, mem_mask); }
@ -446,7 +446,7 @@ static WRITE16_HANDLER( tms_reset_w )
logerror("%06X:tms_reset_w(%02X) = %08X & %08X\n", activecpu_get_pc(), offset, data, ~mem_mask);
cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, (data == 0xffff) ? CLEAR_LINE : ASSERT_LINE);
}
static WRITE32_HANDLER( tms_reset_020_w ) { if ((mem_mask & 0xffff) != 0xffff) tms_reset_w(machine, offset, data, mem_mask); }
static WRITE32_HANDLER( tms_reset_020_w ) { if (ACCESSING_WORD_0) tms_reset_w(machine, offset, data, mem_mask); }
static WRITE16_HANDLER( tms_irq_w )
@ -454,17 +454,17 @@ static WRITE16_HANDLER( tms_irq_w )
/* this is written twice, 0,1, in quick succession */
/* done after uploading, and after modifying the comm area */
logerror("%06X:tms_irq_w(%02X) = %08X & %08X\n", activecpu_get_pc(), offset, data, ~mem_mask);
if (!(mem_mask & 0xff))
if (ACCESSING_BYTE_0)
cpunum_set_input_line(Machine, 1, 0, (data & 0x01) ? CLEAR_LINE : ASSERT_LINE);
}
static WRITE32_HANDLER( tms_irq_020_w ) { if ((mem_mask & 0xffff) != 0xffff) tms_irq_w(machine, offset, data, mem_mask); }
static WRITE32_HANDLER( tms_irq_020_w ) { if (ACCESSING_WORD_0) tms_irq_w(machine, offset, data, mem_mask); }
static WRITE16_HANDLER( tms_control3_w )
{
logerror("%06X:tms_control3_w(%02X) = %08X & %08X\n", activecpu_get_pc(), offset, data, ~mem_mask);
}
static WRITE32_HANDLER( tms_control3_020_w ) { if ((mem_mask & 0xffff) != 0xffff) tms_control3_w(machine, offset, data, mem_mask); }
static WRITE32_HANDLER( tms_control3_020_w ) { if (ACCESSING_WORD_0) tms_control3_w(machine, offset, data, mem_mask); }
static WRITE16_HANDLER( tms_comm_w )
@ -667,7 +667,7 @@ static void adsp_tx_callback(int port, INT32 data)
static WRITE32_HANDLER( unknown_107_w )
{
/* arbitrary data written */
if (!(mem_mask & 0xff))
if (ACCESSING_BYTE_0)
logerror("%06X:unknown_107_w = %02X\n", activecpu_get_pc(), data & 0xff);
else
logerror("%06X:unknown_107_w(%02X) = %08X & %08X\n", activecpu_get_pc(), offset, data, ~mem_mask);
@ -676,7 +676,7 @@ static WRITE32_HANDLER( unknown_107_w )
static WRITE32_HANDLER( unknown_127_w )
{
/* arbitrary data written */
if (!(mem_mask & 0xff))
if (ACCESSING_BYTE_0)
logerror("%06X:unknown_127_w = %02X\n", activecpu_get_pc(), data & 0xff);
else
logerror("%06X:unknown_127_w(%02X) = %08X & %08X\n", activecpu_get_pc(), offset, data, ~mem_mask);
@ -685,7 +685,7 @@ static WRITE32_HANDLER( unknown_127_w )
static WRITE32_HANDLER( unknown_137_w )
{
/* only written $00 or $ff */
if (!(mem_mask & 0xff))
if (ACCESSING_BYTE_0)
logerror("%06X:unknown_137_w = %02X\n", activecpu_get_pc(), data & 0xff);
else
logerror("%06X:unknown_137_w(%02X) = %08X & %08X\n", activecpu_get_pc(), offset, data, ~mem_mask);
@ -694,7 +694,7 @@ static WRITE32_HANDLER( unknown_137_w )
static WRITE32_HANDLER( unknown_13a_w )
{
/* only written $0000 or $0001 */
if (!(mem_mask & 0xffff))
if (ACCESSING_WORD_0)
logerror("%06X:unknown_13a_w = %04X\n", activecpu_get_pc(), data & 0xffff);
else
logerror("%06X:unknown_13a_w(%02X) = %08X & %08X\n", activecpu_get_pc(), offset, data, ~mem_mask);
@ -705,19 +705,19 @@ static WRITE16_HANDLER( led_0_w )
{
/* this has $00 written during an IRQ 6, then reset to $ff afterwards */
/* LED??? */
if (!(mem_mask & 0xff))
if (ACCESSING_BYTE_0)
set_led_status(0, data != 0);
}
static WRITE32_HANDLER( led_0_020_w ) { if ((mem_mask & 0xffff) != 0xffff) led_0_w(machine, offset, data, mem_mask); }
static WRITE32_HANDLER( led_0_020_w ) { if (ACCESSING_WORD_0) led_0_w(machine, offset, data, mem_mask); }
static WRITE16_HANDLER( led_1_w )
{
/* LED??? -- only written $00 or $ff */
if (!(mem_mask & 0xff))
if (ACCESSING_BYTE_0)
set_led_status(1, data != 0);
}
static WRITE32_HANDLER( led_1_020_w ) { if ((mem_mask & 0xffff) != 0xffff) led_1_w(machine, offset, data, mem_mask); }
static WRITE32_HANDLER( led_1_020_w ) { if (ACCESSING_WORD_0) led_1_w(machine, offset, data, mem_mask); }

10
src/mame/drivers/gaiden.c
View File

@ -163,14 +163,14 @@ WRITE16_HANDLER( gaiden_flip_w );
static WRITE16_HANDLER( gaiden_sound_command_w )
{
if (ACCESSING_LSB) soundlatch_w(machine,0,data & 0xff); /* Ninja Gaiden */
if (ACCESSING_MSB) soundlatch_w(machine,0,data >> 8); /* Tecmo Knight */
if (ACCESSING_BYTE_0) soundlatch_w(machine,0,data & 0xff); /* Ninja Gaiden */
if (ACCESSING_BYTE_1) soundlatch_w(machine,0,data >> 8); /* Tecmo Knight */
cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE);
}
static WRITE16_HANDLER( drgnbowl_sound_command_w )
{
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
{
soundlatch_w(machine,0,data >> 8);
cpunum_set_input_line(machine, 1,0,HOLD_LINE);
@ -187,7 +187,7 @@ static int prot;
static WRITE16_HANDLER( wildfang_protection_w )
{
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
{
static int jumpcode;
static const int jumppoints[] =
@ -321,7 +321,7 @@ static MACHINE_RESET ( raiga )
static WRITE16_HANDLER( raiga_protection_w )
{
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
{
static int jumpcode;

8
src/mame/drivers/galpani2.c
View File

@ -44,7 +44,7 @@ static READ16_HANDLER(galpani2_eeprom_r)
static WRITE16_HANDLER(galpani2_eeprom_w)
{
COMBINE_DATA( &eeprom_word );
if ( ACCESSING_LSB )
if ( ACCESSING_BYTE_0 )
{
// latch the bit
EEPROM_write_bit(data & 0x02);
@ -186,7 +186,7 @@ static WRITE16_HANDLER( galpani2_mcu_nmi_w )
static WRITE16_HANDLER( galpani2_coin_lockout_w )
{
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
{
coin_counter_w(0, data & 0x0100);
coin_counter_w(1, data & 0x0200);
@ -200,7 +200,7 @@ static WRITE16_HANDLER( galpani2_coin_lockout_w )
static WRITE16_HANDLER( galpani2_oki_0_bank_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
UINT8 *ROM = memory_region(REGION_SOUND1);
logerror("CPU #0 PC %06X : OKI 0 bank %08X\n",activecpu_get_pc(),data);
@ -210,7 +210,7 @@ static WRITE16_HANDLER( galpani2_oki_0_bank_w )
static WRITE16_HANDLER( galpani2_oki_1_bank_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
OKIM6295_set_bank_base(1, 0x40000 * (data & 0xf) );
logerror("CPU #0 PC %06X : OKI 1 bank %08X\n",activecpu_get_pc(),data);

8
src/mame/drivers/galpanic.c
View File

@ -161,7 +161,7 @@ static INTERRUPT_GEN( galhustl_interrupt )
static WRITE16_HANDLER( galpanic_6295_bankswitch_w )
{
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
{
UINT8 *rom = memory_region(REGION_SOUND1);
@ -174,7 +174,7 @@ static WRITE16_HANDLER( galpanic_6295_bankswitch_w )
static WRITE16_HANDLER( galpania_6295_bankswitch_w )
{
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
{
UINT8 *rom = memory_region(REGION_SOUND1);
@ -185,7 +185,7 @@ static WRITE16_HANDLER( galpania_6295_bankswitch_w )
#ifdef UNUSED_FUNCTION
static WRITE16_HANDLER( galpania_misc_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
pandora_set_clear_bitmap( data & 0x0004 );
}
@ -196,7 +196,7 @@ static WRITE16_HANDLER( galpania_misc_w )
static WRITE16_HANDLER( galpanic_coin_w )
{
if (ACCESSING_MSB)
if (ACCESSING_BYTE_1)
{
coin_counter_w(0, data & 0x100);
coin_counter_w(1, data & 0x200);

2
src/mame/drivers/galspnbl.c
View File

@ -36,7 +36,7 @@ VIDEO_UPDATE( galspnbl );
static WRITE16_HANDLER( soundcommand_w )
{
if (ACCESSING_LSB)
if (ACCESSING_BYTE_0)
{
soundlatch_w(machine,offset,data & 0xff);
cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE);

36
src/mame/drivers/gamecstl.c
View File

@ -186,19 +186,19 @@ static void intel82439tx_init(void)
static UINT32 intel82439tx_pci_r(int function, int reg, UINT32 mem_mask)
{
UINT32 r = 0;
if (!(mem_mask & 0xff000000))
if (ACCESSING_BYTE_3)
{
r |= mxtc_config_r(function, reg + 3) << 24;
}
if (!(mem_mask & 0x00ff0000))
if (ACCESSING_BYTE_2)
{
r |= mxtc_config_r(function, reg + 2) << 16;
}
if (!(mem_mask & 0x0000ff00))
if (ACCESSING_BYTE_1)
{
r |= mxtc_config_r(function, reg + 1) << 8;
}
if (!(mem_mask & 0x000000ff))
if (ACCESSING_BYTE_0)
{
r |= mxtc_config_r(function, reg + 0) << 0;
}
@ -207,19 +207,19 @@ static UINT32 intel82439tx_pci_r(int function, int reg, UINT32 mem_mask)
static void intel82439tx_pci_w(int function, int reg, UINT32 data, UINT32 mem_mask)
{
if (!(mem_mask & 0xff000000))
if (ACCESSING_BYTE_3)
{
mxtc_config_w(function, reg + 3, (data >> 24) & 0xff);
}
if (!(mem_mask & 0x00ff0000))
if (ACCESSING_BYTE_2)
{
mxtc_config_w(function, reg + 2, (data >> 16) & 0xff);
}
if (!(mem_mask & 0x0000ff00))
if (ACCESSING_BYTE_1)
{
mxtc_config_w(function, reg + 1, (data >> 8) & 0xff);
}
if (!(mem_mask & 0x000000ff))
if (ACCESSING_BYTE_0)
{
mxtc_config_w(function, reg + 0, (data >> 0) & 0xff);
}
@ -243,19 +243,19 @@ static void piix4_config_w(int function, int reg, UINT8 data)
static UINT32 intel82371ab_pci_r(int function, int reg, UINT32 mem_mask)
{
UINT32 r = 0;
if (!(mem_mask & 0xff000000))
if (ACCESSING_BYTE_3)
{
r |= piix4_config_r(function, reg + 3) << 24;
}
if (!(mem_mask & 0x00ff0000))
if (ACCESSING_BYTE_2)
{
r |= piix4_config_r(function, reg + 2) << 16;
}
if (!(mem_mask & 0x0000ff00))
if (ACCESSING_BYTE_1)
{
r |= piix4_config_r(function, reg + 1) << 8;
}
if (!(mem_mask & 0x000000ff))
if (ACCESSING_BYTE_0)
{
r |= piix4_config_r(function, reg + 0) << 0;
}
@ -264,19 +264,19 @@ static UINT32 intel82371ab_pci_r(int function, int reg, UINT32 mem_mask)
static void intel82371ab_pci_w(int function, int reg, UINT32 data, UINT32 mem_mask)
{
if (!(mem_mask & 0xff000000))
if (ACCESSING_BYTE_3)
{
piix4_config_w(function, reg + 3, (data >> 24) & 0xff);
}
if (!(mem_mask & 0x00ff0000))
if (ACCESSING_BYTE_2)
{
piix4_config_w(function, reg + 2, (data >> 16) & 0xff);
}
if (!(mem_mask & 0x0000ff00))
if (ACCESSING_BYTE_1)
{
piix4_config_w(function, reg + 1, (data >> 8) & 0xff);
}
if (!(mem_mask & 0x000000ff))
if (ACCESSING_BYTE_0)
{
piix4_config_w(function, reg + 0, (data >> 0) & 0xff);
}
@ -285,7 +285,7 @@ static void intel82371ab_pci_w(int function, int reg, UINT32 data, UINT32 mem_ma
// ISA Plug-n-Play
static WRITE32_HANDLER( pnp_config_w )
{
if (!(mem_mask & 0x0000ff00))
if (ACCESSING_BYTE_1)
{
// mame_printf_debug("PNP Config: %02X\n", (data >> 8) & 0xff);
}
@ -293,7 +293,7 @@ static WRITE32_HANDLER( pnp_config_w )
static WRITE32_HANDLER( pnp_data_w )
{
if (!(mem_mask & 0x0000ff00))
if (ACCESSING_BYTE_1)
{
// mame_printf_debug("PNP Data: %02X\n", (data >> 8) & 0xff);
}

Some files were not shown because too many files have changed in this diff Show More