diff options
author | 2008-08-15 20:11:15 +0000 | |
---|---|---|
committer | 2008-08-15 20:11:15 +0000 | |
commit | bd3ba85c50a51c25e07a9697af56da69e86890b4 (patch) | |
tree | 85a5e82b62dfa58e36ff73a09b9ac2cbb15df407 /src/emu | |
parent | 6bb2a0e6989a8a6f444010a0f550198d18ca774c (diff) |
changed at28c16 memory handlers to 8 bits and perform the conversion in the memory mapping.
Diffstat (limited to 'src/emu')
-rw-r--r-- | src/emu/machine/at28c16.c | 124 | ||||
-rw-r--r-- | src/emu/machine/at28c16.h | 40 |
2 files changed, 18 insertions, 146 deletions
diff --git a/src/emu/machine/at28c16.c b/src/emu/machine/at28c16.c index 758a76e25d8..9665fbb47e0 100644 --- a/src/emu/machine/at28c16.c +++ b/src/emu/machine/at28c16.c @@ -145,119 +145,11 @@ static void at28c16_write( UINT32 chip, offs_t offset, UINT8 data ) } } -/* 16bit memory handlers */ - -static UINT16 at28c16_16msb_read( UINT32 chip, offs_t offset, UINT32 mem_mask ) -{ - UINT32 data = 0; - if( ACCESSING_BITS_8_15 ) - { - data |= at28c16_read( chip, offset ) << 8; - } - return data; -} - -static void at28c16_16msb_write( UINT32 chip, offs_t offset, UINT32 data, UINT32 mem_mask ) -{ - if( ACCESSING_BITS_8_15 ) - { - at28c16_write( chip, offset, data >> 8 ); - } -} - -READ16_HANDLER( at28c16_16msb_0_r ) { return at28c16_16msb_read( 0, offset, mem_mask ); } -READ16_HANDLER( at28c16_16msb_1_r ) { return at28c16_16msb_read( 1, offset, mem_mask ); } -READ16_HANDLER( at28c16_16msb_2_r ) { return at28c16_16msb_read( 2, offset, mem_mask ); } -READ16_HANDLER( at28c16_16msb_3_r ) { return at28c16_16msb_read( 3, offset, mem_mask ); } -WRITE16_HANDLER( at28c16_16msb_0_w ) { at28c16_16msb_write( 0, offset, data, mem_mask ); } -WRITE16_HANDLER( at28c16_16msb_1_w ) { at28c16_16msb_write( 1, offset, data, mem_mask ); } -WRITE16_HANDLER( at28c16_16msb_2_w ) { at28c16_16msb_write( 2, offset, data, mem_mask ); } -WRITE16_HANDLER( at28c16_16msb_3_w ) { at28c16_16msb_write( 3, offset, data, mem_mask ); } - -/* 32bit memory handlers */ - -static UINT32 at28c16_32le_read( UINT32 chip, offs_t offset, UINT32 mem_mask ) -{ - UINT32 data = 0; - if( ACCESSING_BITS_0_7 ) - { - data |= at28c16_read( chip, ( offset * 4 ) + 0 ) << 0; - } - if( ACCESSING_BITS_8_15 ) - { - data |= at28c16_read( chip, ( offset * 4 ) + 1 ) << 8; - } - if( ACCESSING_BITS_16_23 ) - { - data |= at28c16_read( chip, ( offset * 4 ) + 2 ) << 16; - } - if( ACCESSING_BITS_24_31 ) - { - data |= at28c16_read( chip, ( offset * 4 ) + 3 ) << 24; - } - return data; -} - -static void at28c16_32le_write( UINT32 chip, offs_t offset, UINT32 data, UINT32 mem_mask ) -{ - if( ACCESSING_BITS_0_7 ) - { - at28c16_write( chip, ( offset * 4 ) + 0, data >> 0 ); - } - if( ACCESSING_BITS_8_15 ) - { - at28c16_write( chip, ( offset * 4 ) + 1, data >> 8 ); - } - if( ACCESSING_BITS_16_23 ) - { - at28c16_write( chip, ( offset * 4 ) + 2, data >> 16 ); - } - if( ACCESSING_BITS_24_31 ) - { - at28c16_write( chip, ( offset * 4 ) + 3, data >> 24 ); - } -} - -READ32_HANDLER( at28c16_32le_0_r ) { return at28c16_32le_read( 0, offset, mem_mask ); } -READ32_HANDLER( at28c16_32le_1_r ) { return at28c16_32le_read( 1, offset, mem_mask ); } -READ32_HANDLER( at28c16_32le_2_r ) { return at28c16_32le_read( 2, offset, mem_mask ); } -READ32_HANDLER( at28c16_32le_3_r ) { return at28c16_32le_read( 3, offset, mem_mask ); } -WRITE32_HANDLER( at28c16_32le_0_w ) { at28c16_32le_write( 0, offset, data, mem_mask ); } -WRITE32_HANDLER( at28c16_32le_1_w ) { at28c16_32le_write( 1, offset, data, mem_mask ); } -WRITE32_HANDLER( at28c16_32le_2_w ) { at28c16_32le_write( 2, offset, data, mem_mask ); } -WRITE32_HANDLER( at28c16_32le_3_w ) { at28c16_32le_write( 3, offset, data, mem_mask ); } - -static UINT32 at28c16_32le_16lsb_read( UINT32 chip, offs_t offset, UINT32 mem_mask ) -{ - UINT32 data = 0; - if( ACCESSING_BITS_0_7 ) - { - data |= at28c16_read( chip, ( offset * 2 ) + 0 ) << 0; - } - if( ACCESSING_BITS_16_23 ) - { - data |= at28c16_read( chip, ( offset * 2 ) + 1 ) << 16; - } - return data; -} - -static void at28c16_32le_16lsb_write( UINT32 chip, offs_t offset, UINT32 data, UINT32 mem_mask ) -{ - if( ACCESSING_BITS_0_7 ) - { - at28c16_write( chip, ( offset * 2 ) + 0, data >> 0 ); - } - if( ACCESSING_BITS_16_23 ) - { - at28c16_write( chip, ( offset * 2 ) + 1, data >> 16 ); - } -} - -READ32_HANDLER( at28c16_32le_16lsb_0_r ) { return at28c16_32le_16lsb_read( 0, offset, mem_mask ); } -READ32_HANDLER( at28c16_32le_16lsb_1_r ) { return at28c16_32le_16lsb_read( 1, offset, mem_mask ); } -READ32_HANDLER( at28c16_32le_16lsb_2_r ) { return at28c16_32le_16lsb_read( 2, offset, mem_mask ); } -READ32_HANDLER( at28c16_32le_16lsb_3_r ) { return at28c16_32le_16lsb_read( 3, offset, mem_mask ); } -WRITE32_HANDLER( at28c16_32le_16lsb_0_w ) { at28c16_32le_16lsb_write( 0, offset, data, mem_mask ); } -WRITE32_HANDLER( at28c16_32le_16lsb_1_w ) { at28c16_32le_16lsb_write( 1, offset, data, mem_mask ); } -WRITE32_HANDLER( at28c16_32le_16lsb_2_w ) { at28c16_32le_16lsb_write( 2, offset, data, mem_mask ); } -WRITE32_HANDLER( at28c16_32le_16lsb_3_w ) { at28c16_32le_16lsb_write( 3, offset, data, mem_mask ); } +READ8_HANDLER( at28c16_0_r ) { return at28c16_read( 0, offset ); } +READ8_HANDLER( at28c16_1_r ) { return at28c16_read( 1, offset ); } +READ8_HANDLER( at28c16_2_r ) { return at28c16_read( 2, offset ); } +READ8_HANDLER( at28c16_3_r ) { return at28c16_read( 3, offset ); } +WRITE8_HANDLER( at28c16_0_w ) { at28c16_write( 0, offset, data ); } +WRITE8_HANDLER( at28c16_1_w ) { at28c16_write( 1, offset, data ); } +WRITE8_HANDLER( at28c16_2_w ) { at28c16_write( 2, offset, data ); } +WRITE8_HANDLER( at28c16_3_w ) { at28c16_write( 3, offset, data ); } diff --git a/src/emu/machine/at28c16.h b/src/emu/machine/at28c16.h index e289df71eb6..fb0df9cf373 100644 --- a/src/emu/machine/at28c16.h +++ b/src/emu/machine/at28c16.h @@ -20,35 +20,15 @@ NVRAM_HANDLER( at28c16_1 ); NVRAM_HANDLER( at28c16_2 ); NVRAM_HANDLER( at28c16_3 ); -/* 16bit memory handlers */ - -extern READ16_HANDLER( at28c16_16msb_0_r ); -extern READ16_HANDLER( at28c16_16msb_1_r ); -extern READ16_HANDLER( at28c16_16msb_2_r ); -extern READ16_HANDLER( at28c16_16msb_3_r ); -extern WRITE16_HANDLER( at28c16_16msb_0_w ); -extern WRITE16_HANDLER( at28c16_16msb_1_w ); -extern WRITE16_HANDLER( at28c16_16msb_2_w ); -extern WRITE16_HANDLER( at28c16_16msb_3_w ); - -/* 32bit memory handlers */ - -extern READ32_HANDLER( at28c16_32le_0_r ); -extern READ32_HANDLER( at28c16_32le_1_r ); -extern READ32_HANDLER( at28c16_32le_2_r ); -extern READ32_HANDLER( at28c16_32le_3_r ); -extern WRITE32_HANDLER( at28c16_32le_0_w ); -extern WRITE32_HANDLER( at28c16_32le_1_w ); -extern WRITE32_HANDLER( at28c16_32le_2_w ); -extern WRITE32_HANDLER( at28c16_32le_3_w ); - -extern READ32_HANDLER( at28c16_32le_16lsb_0_r ); -extern READ32_HANDLER( at28c16_32le_16lsb_1_r ); -extern READ32_HANDLER( at28c16_32le_16lsb_2_r ); -extern READ32_HANDLER( at28c16_32le_16lsb_3_r ); -extern WRITE32_HANDLER( at28c16_32le_16lsb_0_w ); -extern WRITE32_HANDLER( at28c16_32le_16lsb_1_w ); -extern WRITE32_HANDLER( at28c16_32le_16lsb_2_w ); -extern WRITE32_HANDLER( at28c16_32le_16lsb_3_w ); +/* memory handlers */ + +extern READ8_HANDLER( at28c16_0_r ); +extern READ8_HANDLER( at28c16_1_r ); +extern READ8_HANDLER( at28c16_2_r ); +extern READ8_HANDLER( at28c16_3_r ); +extern WRITE8_HANDLER( at28c16_0_w ); +extern WRITE8_HANDLER( at28c16_1_w ); +extern WRITE8_HANDLER( at28c16_2_w ); +extern WRITE8_HANDLER( at28c16_3_w ); #endif |