From 3256f11a611e1b2bc1ae25ffa9a4b55baed5a671 Mon Sep 17 00:00:00 2001 From: Wilbert Pol Date: Tue, 24 Aug 2010 18:14:46 +0000 Subject: [PATCH] i2cmem.c: Removed m_page_size member from i2cmem_device to use m_page_size from the config. --- src/emu/machine/i2cmem.c | 16 ++++++++-------- src/emu/machine/i2cmem.h | 1 - 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/emu/machine/i2cmem.c b/src/emu/machine/i2cmem.c index 63f0cfcd349..12559810206 100644 --- a/src/emu/machine/i2cmem.c +++ b/src/emu/machine/i2cmem.c @@ -183,9 +183,9 @@ i2cmem_device::i2cmem_device( running_machine &_machine, const i2cmem_device_con m_sdar( 1 ), m_state( STATE_IDLE ) { - if( m_page_size > 0 ) + if( m_config.m_page_size > 0 ) { - m_page = auto_alloc_array( machine, UINT8, m_page_size ); + m_page = auto_alloc_array( machine, UINT8, m_config.m_page_size ); } } @@ -208,7 +208,7 @@ void i2cmem_device::device_start() state_save_register_device_item( this, 0, m_shift ); state_save_register_device_item( this, 0, m_devsel ); state_save_register_device_item( this, 0, m_byteaddr ); - state_save_register_device_item_pointer( this, 0, m_page, m_page_size ); + state_save_register_device_item_pointer( this, 0, m_page, m_config.m_page_size ); } @@ -450,19 +450,19 @@ void i2cmem_device::set_scl_line( int state ) verboselog( this, 0, "write not enabled\n" ); m_state = STATE_IDLE; } - else if( m_page_size > 0 ) + else if( m_config.m_page_size > 0 ) { m_page[ m_page_offset ] = m_shift; verboselog( this, 1, "page[ %04x ] <- %02x\n", m_page_offset, m_page[ m_page_offset ] ); m_page_offset++; - if( m_page_offset == m_page_size ) + if( m_page_offset == m_config.m_page_size ) { - int offset = data_offset() & ~( m_page_size - 1 ); + int offset = data_offset() & ~( m_config.m_page_size - 1 ); - verboselog( this, 1, "data[ %04x to %04x ] = page\n", offset, offset + m_page_size - 1 ); + verboselog( this, 1, "data[ %04x to %04x ] = page\n", offset, offset + m_config.m_page_size - 1 ); - for( int i = 0; i < m_page_size; i++ ) + for( int i = 0; i < m_config.m_page_size; i++ ) { m_addrspace[ 0 ]->write_byte( offset + i, m_page[ i ] ); } diff --git a/src/emu/machine/i2cmem.h b/src/emu/machine/i2cmem.h index 6e73d31b799..10b92edd55b 100644 --- a/src/emu/machine/i2cmem.h +++ b/src/emu/machine/i2cmem.h @@ -135,7 +135,6 @@ protected: int m_byteaddr; UINT8 *m_page; int m_page_offset; - int m_page_size; };