Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-08 09:30:17 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

variable name consistency, pass 2 (n/w)

Browse Source
This commit is contained in:
Lord-Nightmare 2016-09-06 13:45:15 -04:00
parent 2df6cd563a
commit 4c533586de
3 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/mame/drivers/arkanoid.cpp
View File

@ -1287,12 +1287,12 @@ void arkanoid_state::machine_start()
save_item(NAME(m_MCUHasWritten)); save_item(NAME(m_MCUHasWritten));
save_item(NAME(m_fromMCU)); save_item(NAME(m_fromMCU));
save_item(NAME(m_port_a_in)); save_item(NAME(m_portA_in));
save_item(NAME(m_port_a_out)); save_item(NAME(m_portA_out));
save_item(NAME(m_ddr_a)); save_item(NAME(m_ddrA));
save_item(NAME(m_port_c_internal)); save_item(NAME(m_portC_internal));
save_item(NAME(m_port_c_out)); save_item(NAME(m_portC_out));
save_item(NAME(m_ddr_c)); save_item(NAME(m_ddrC));
save_item(NAME(m_tdr)); save_item(NAME(m_tdr));
save_item(NAME(m_tcr)); save_item(NAME(m_tcr));
} }
@ -1315,12 +1315,12 @@ void arkanoid_state::machine_reset()
if (m_mcu.found()) m_mcu->set_input_line(M68705_IRQ_LINE, CLEAR_LINE); if (m_mcu.found()) m_mcu->set_input_line(M68705_IRQ_LINE, CLEAR_LINE);
if (m_mcu.found()) m_68705_timer->adjust(attotime::from_hz(((XTAL_12MHz/4)/4)/(1<<7))); if (m_mcu.found()) m_68705_timer->adjust(attotime::from_hz(((XTAL_12MHz/4)/4)/(1<<7)));
m_port_a_in = 0; m_portA_in = 0;
m_port_a_out = 0; m_portA_out = 0;
m_ddr_a = 0; m_ddrA = 0;
m_port_c_internal = 0; m_portC_internal = 0;
m_port_c_out = 0; m_portC_out = 0;
m_ddr_c = 0; m_ddrC = 0;
m_tdr = 0xFF; m_tdr = 0xFF;
m_tcr = 0x7F; m_tcr = 0x7F;
} }

12
src/mame/includes/arkanoid.h
View File

@ -54,12 +54,12 @@ public:
UINT8 m_fromMCU; // byte latch for 68705->z80 comms UINT8 m_fromMCU; // byte latch for 68705->z80 comms
/* mcu internal related */ /* mcu internal related */
UINT8 m_port_a_in; UINT8 m_portA_in;
UINT8 m_port_a_out; UINT8 m_portA_out;
UINT8 m_ddr_a; UINT8 m_ddrA;
UINT8 m_port_c_internal; UINT8 m_portC_internal;
UINT8 m_port_c_out; UINT8 m_portC_out;
UINT8 m_ddr_c; UINT8 m_ddrC;
UINT8 m_tdr; UINT8 m_tdr;
UINT8 m_tcr; UINT8 m_tcr;
emu_timer *m_68705_timer; emu_timer *m_68705_timer;

54
src/mame/machine/arkanoid.cpp
View File

@ -34,17 +34,17 @@ WRITE8_MEMBER(arkanoid_state::arkanoid_Z80_mcu_w)
READ8_MEMBER(arkanoid_state::arkanoid_68705_port_a_r) READ8_MEMBER(arkanoid_state::arkanoid_68705_port_a_r)
{ {
return (m_port_a_out & m_ddr_a) | (m_port_a_in & ~m_ddr_a); return (m_portA_out & m_ddrA) | (m_portA_in & ~m_ddrA);
} }
WRITE8_MEMBER(arkanoid_state::arkanoid_68705_port_a_w) WRITE8_MEMBER(arkanoid_state::arkanoid_68705_port_a_w)
{ {
m_port_a_out = data; m_portA_out = data;
} }
WRITE8_MEMBER(arkanoid_state::arkanoid_68705_ddr_a_w) WRITE8_MEMBER(arkanoid_state::arkanoid_68705_ddr_a_w)
{ {
m_ddr_a = data; m_ddrA = data;
} }
READ8_MEMBER(arkanoid_state::arkanoid_68705_tdr_r) READ8_MEMBER(arkanoid_state::arkanoid_68705_tdr_r)
@ -135,75 +135,75 @@ READ8_MEMBER(arkanoid_state::arkanoid_68705_port_c_r)
if (!m_MCUHasWritten) if (!m_MCUHasWritten)
port_c_in |= 0x02; port_c_in |= 0x02;
/* bit 2 is an output, to clear latch 1, return whatever state it was set to in m_port_c_out */ /* bit 2 is an output, to clear latch 1, return whatever state it was set to in m_portC_out */
/* bit 3 is an output, to set latch 2, return whatever state it was set to in m_port_c_out */ /* bit 3 is an output, to set latch 2, return whatever state it was set to in m_portC_out */
return (m_port_c_internal & m_ddr_c) | (port_c_in & ~m_ddr_c); return (m_portC_internal & m_ddrC) | (port_c_in & ~m_ddrC);
} }
WRITE8_MEMBER(arkanoid_state::arkanoid_68705_port_c_w) WRITE8_MEMBER(arkanoid_state::arkanoid_68705_port_c_w)
{ {
m_port_c_internal = data|0xF0; m_portC_internal = data|0xF0;
UINT8 changed_m_port_c_out = (m_port_c_out^(m_port_c_internal|(~m_ddr_c))); UINT8 changed_m_portC_out = (m_portC_out^(m_portC_internal|(~m_ddrC)));
m_port_c_out = (m_port_c_internal|(~m_ddr_c)); m_portC_out = (m_portC_internal|(~m_ddrC));
/* bits 0 and 1 are inputs, should never be set as outputs here. if they are, ignore them. */ /* bits 0 and 1 are inputs, should never be set as outputs here. if they are, ignore them. */
/* bit 2 is an output, to clear latch 1(m_Z80HasWritten) on rising edge, and enable the z80->68705 communication latch on level low */ /* bit 2 is an output, to clear latch 1(m_Z80HasWritten) on rising edge, and enable the z80->68705 communication latch on level low */
// if 0x04 rising edge, clear m_Z80HasWritten/latch 1 (and clear the irq line) // if 0x04 rising edge, clear m_Z80HasWritten/latch 1 (and clear the irq line)
if ((changed_m_port_c_out&0x04) && (m_port_c_out&0x04)) if ((changed_m_portC_out&0x04) && (m_portC_out&0x04))
{ {
m_Z80HasWritten = 0; m_Z80HasWritten = 0;
m_mcu->set_input_line(M68705_IRQ_LINE, CLEAR_LINE); m_mcu->set_input_line(M68705_IRQ_LINE, CLEAR_LINE);
} }
// if 0x04 low, enable the m_port_a_in latch, otherwise set the latch value to 0xFF // if 0x04 low, enable the m_portA_in latch, otherwise set the latch value to 0xFF
if (~m_port_c_out&0x04) if (~m_portC_out&0x04)
m_port_a_in = m_fromZ80; m_portA_in = m_fromZ80;
else else
m_port_a_in = 0xFF; m_portA_in = 0xFF;
/* bit 3 is an output, to set latch 2(m_MCUHasWritten) and latch the port_a value into the 68705->z80 latch, on falling edge or low level */ /* bit 3 is an output, to set latch 2(m_MCUHasWritten) and latch the port_a value into the 68705->z80 latch, on falling edge or low level */
// if 0x08 low, set m_MCUHasWritten/latch 2 // if 0x08 low, set m_MCUHasWritten/latch 2
if (~m_port_c_out&0x08) if (~m_portC_out&0x08)
{ {
/* a write from the 68705 to the Z80; remember its value */ /* a write from the 68705 to the Z80; remember its value */
m_MCUHasWritten = 1; m_MCUHasWritten = 1;
m_fromMCU = m_port_a_out; m_fromMCU = m_portA_out;
} }
} }
WRITE8_MEMBER(arkanoid_state::arkanoid_68705_ddr_c_w) WRITE8_MEMBER(arkanoid_state::arkanoid_68705_ddr_c_w)
{ {
if ((data|0xF0)^m_ddr_c) // if ddr changed, recalculate the port c output if ((data|0xF0)^m_ddrC) // if ddr changed, recalculate the port c output
{ {
UINT8 changed_m_port_c_out = (m_port_c_out^(m_port_c_internal|(~(data|0xF0)))); UINT8 changed_m_portC_out = (m_portC_out^(m_portC_internal|(~(data|0xF0))));
m_port_c_out = (m_port_c_internal|(~(data|0xF0))); m_portC_out = (m_portC_internal|(~(data|0xF0)));
/* bits 0 and 1 are inputs, should never be set as outputs here. if they are, ignore them. */ /* bits 0 and 1 are inputs, should never be set as outputs here. if they are, ignore them. */
/* bit 2 is an output, to clear latch 1(m_Z80HasWritten) on rising edge, and enable the z80->68705 communication latch on level low */ /* bit 2 is an output, to clear latch 1(m_Z80HasWritten) on rising edge, and enable the z80->68705 communication latch on level low */
// if 0x04 rising edge, clear m_Z80HasWritten/latch 1 (and clear the irq line) // if 0x04 rising edge, clear m_Z80HasWritten/latch 1 (and clear the irq line)
if ((changed_m_port_c_out&0x04) && (m_port_c_out&0x04)) if ((changed_m_portC_out&0x04) && (m_portC_out&0x04))
{ {
m_Z80HasWritten = 0; m_Z80HasWritten = 0;
m_mcu->set_input_line(M68705_IRQ_LINE, CLEAR_LINE); m_mcu->set_input_line(M68705_IRQ_LINE, CLEAR_LINE);
} }
// if 0x04 low, enable the m_port_a_in latch, otherwise set the latch value to 0xFF // if 0x04 low, enable the m_portA_in latch, otherwise set the latch value to 0xFF
if (~m_port_c_out&0x04) if (~m_portC_out&0x04)
m_port_a_in = m_fromZ80; m_portA_in = m_fromZ80;
else else
m_port_a_in = 0xFF; m_portA_in = 0xFF;
/* bit 3 is an output, to set latch 2(m_MCUHasWritten) and latch the port_a value into the 68705->z80 latch, on falling edge or low level */ /* bit 3 is an output, to set latch 2(m_MCUHasWritten) and latch the port_a value into the 68705->z80 latch, on falling edge or low level */
// if 0x08 low, set m_MCUHasWritten/latch 2 // if 0x08 low, set m_MCUHasWritten/latch 2
if (~m_port_c_out&0x08) if (~m_portC_out&0x08)
{ {
/* a write from the 68705 to the Z80; remember its value */ /* a write from the 68705 to the Z80; remember its value */
m_MCUHasWritten = 1; m_MCUHasWritten = 1;
m_fromMCU = m_port_a_out; m_fromMCU = m_portA_out;
} }
} }
m_ddr_c = data|0xF0; m_ddrC = data|0xF0;
} }
CUSTOM_INPUT_MEMBER(arkanoid_state::arkanoid_semaphore_input_r) CUSTOM_INPUT_MEMBER(arkanoid_state::arkanoid_semaphore_input_r)