Sprinter/mame
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(MESS) Use proper method names. (nw)

Browse Source
This commit is contained in:
Michael Zapf 2013-10-13 15:56:06 +00:00
parent f2c3f5e7e5
commit c60b42d0b3
8 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mess/drivers/geneve.c
View File

@ -677,7 +677,7 @@ WRITE_LINE_MEMBER( geneve_state::clock_out )
*/ */
WRITE_LINE_MEMBER( geneve_state::dbin_line ) WRITE_LINE_MEMBER( geneve_state::dbin_line )
{ {
m_mapper->dbin(state); m_mapper->dbin_in(state);
} }
static TMS9995_CONFIG( geneve_processor_config ) static TMS9995_CONFIG( geneve_processor_config )

8
src/mess/machine/ti99/datamux.c
View File

@ -291,7 +291,7 @@ SETOFFSET_MEMBER( ti99_datamux_device::setoffset )
The datamux is connected to the clock line in order to operate The datamux is connected to the clock line in order to operate
the wait state counter and to read/write the bytes. the wait state counter and to read/write the bytes.
*/ */
void ti99_datamux_device::clock_in(int clock) WRITE_LINE_MEMBER( ti99_datamux_device::clock_in )
{ {
// return immediately if the datamux is currently inactive // return immediately if the datamux is currently inactive
if (m_waitcount>0) if (m_waitcount>0)
@ -300,7 +300,7 @@ void ti99_datamux_device::clock_in(int clock)
if (m_read_mode) if (m_read_mode)
{ {
// Reading // Reading
if (clock==ASSERT_LINE) if (state==ASSERT_LINE)
{ // raising edge { // raising edge
m_waitcount--; m_waitcount--;
if (m_waitcount==0) m_ready(ASSERT_LINE); if (m_waitcount==0) m_ready(ASSERT_LINE);
@ -316,7 +316,7 @@ void ti99_datamux_device::clock_in(int clock)
} }
else else
{ {
if (clock==ASSERT_LINE) if (state==ASSERT_LINE)
{ // raising edge { // raising edge
m_waitcount--; m_waitcount--;
if (m_waitcount==0) m_ready(ASSERT_LINE); if (m_waitcount==0) m_ready(ASSERT_LINE);
@ -336,7 +336,7 @@ void ti99_datamux_device::clock_in(int clock)
} }
} }
void ti99_datamux_device::dbin_in(int state) WRITE_LINE_MEMBER( ti99_datamux_device::dbin_in )
{ {
m_read_mode = (state==ASSERT_LINE); m_read_mode = (state==ASSERT_LINE);
if (VERBOSE>7) LOG("datamux: data bus in = %d\n", m_read_mode? 1:0 ); if (VERBOSE>7) LOG("datamux: data bus in = %d\n", m_read_mode? 1:0 );

4
src/mess/machine/ti99/datamux.h
View File

@ -72,8 +72,8 @@ public:
DECLARE_WRITE16_MEMBER( write ); DECLARE_WRITE16_MEMBER( write );
DECLARE_SETOFFSET_MEMBER( setoffset ); DECLARE_SETOFFSET_MEMBER( setoffset );
void clock_in(int state); DECLARE_WRITE_LINE_MEMBER( clock_in );
void dbin_in(int state); DECLARE_WRITE_LINE_MEMBER( dbin_in );
protected: protected:
/* Constructor */ /* Constructor */

35
src/mess/machine/ti99/genboard.c
View File

@ -319,8 +319,7 @@ READ8_MEMBER( geneve_mapper_device::readm )
switch (dec->function) switch (dec->function)
{ {
case MLGVIDEO: case MLGVIDEO:
// TODO: remove mem_mask m_video->readz(space, dec->offset, &value, 0xff);
m_video->readz(space, dec->offset, &value, mem_mask);
if (VERBOSE>7) LOG("genboard: Read video %04x -> %02x\n", dec->offset, value); if (VERBOSE>7) LOG("genboard: Read video %04x -> %02x\n", dec->offset, value);
break; break;
@ -374,7 +373,7 @@ READ8_MEMBER( geneve_mapper_device::readm )
// video // video
// ++++ ++-- ---- ---+ // ++++ ++-- ---- ---+
// 1000 1000 0000 00x0 // 1000 1000 0000 00x0
m_video->readz(space, dec->offset, &value, mem_mask); m_video->readz(space, dec->offset, &value, 0xff);
if (VERBOSE>7) LOG("genboard: Read video %04x -> %02x\n", dec->offset, value); if (VERBOSE>7) LOG("genboard: Read video %04x -> %02x\n", dec->offset, value);
break; break;
@ -383,7 +382,7 @@ READ8_MEMBER( geneve_mapper_device::readm )
// ++++ ++-- ---- ---+ // ++++ ++-- ---- ---+
// 1001 0000 0000 0000 // 1001 0000 0000 0000
// We need to add the address prefix bits // We need to add the address prefix bits
m_peribox->readz(space, dec->offset, &value, mem_mask); m_peribox->readz(space, dec->offset, &value, 0xff);
if (VERBOSE>7) LOG("genboard: Read speech -> %02x\n", value); if (VERBOSE>7) LOG("genboard: Read speech -> %02x\n", value);
break; break;
@ -391,7 +390,7 @@ READ8_MEMBER( geneve_mapper_device::readm )
// grom simulation // grom simulation
// ++++ ++-- ---- ---+ // ++++ ++-- ---- ---+
// 1001 1000 0000 00x0 // 1001 1000 0000 00x0
if (!space.debugger_access()) value = read_grom(space, dec->offset, mem_mask); if (!space.debugger_access()) value = read_grom(space, dec->offset, 0xff);
if (VERBOSE>7) LOG("genboard: Read GROM %04x -> %02x\n", dec->offset, value); if (VERBOSE>7) LOG("genboard: Read GROM %04x -> %02x\n", dec->offset, value);
break; break;
@ -437,7 +436,7 @@ READ8_MEMBER( geneve_mapper_device::readm )
// 0x000000-0x07ffff for the stock Geneve (AMC,AMB,AMA,A0 ...,A15) // 0x000000-0x07ffff for the stock Geneve (AMC,AMB,AMA,A0 ...,A15)
// 0x000000-0x1fffff for the GenMod.(AME,AMD,AMC,AMB,AMA,A0 ...,A15) // 0x000000-0x1fffff for the GenMod.(AME,AMD,AMC,AMB,AMA,A0 ...,A15)
m_peribox->readz(space, dec->physaddr, &value, mem_mask); m_peribox->readz(space, dec->physaddr, &value, 0xff);
if (VERBOSE>7) LOG("genboard: Read P-Box %04x (%06x) -> %02x\n", dec->offset, dec->physaddr, value); if (VERBOSE>7) LOG("genboard: Read P-Box %04x (%06x) -> %02x\n", dec->offset, dec->physaddr, value);
break; break;
@ -454,7 +453,7 @@ READ8_MEMBER( geneve_mapper_device::readm )
case MPGMBOX: case MPGMBOX:
// Route everything else to the P-Box // Route everything else to the P-Box
m_peribox->readz(space, dec->physaddr, &value, mem_mask); m_peribox->readz(space, dec->physaddr, &value, 0xff);
break; break;
} }
return value; return value;
@ -484,7 +483,7 @@ WRITE8_MEMBER( geneve_mapper_device::writem )
// video // video
// ++++ ++++ ++++ ---+ // ++++ ++++ ++++ ---+
// 1111 0001 0000 .cc0 // 1111 0001 0000 .cc0
m_video->write(space, dec->offset, data, mem_mask); m_video->write(space, dec->offset, data, 0xff);
if (VERBOSE>7) LOG("genboard: Write video %04x <- %02x\n", offset, data); if (VERBOSE>7) LOG("genboard: Write video %04x <- %02x\n", offset, data);
break; break;
@ -504,7 +503,7 @@ WRITE8_MEMBER( geneve_mapper_device::writem )
case MLGSOUND: case MLGSOUND:
// sound // sound
// ++++ ++++ ++++ ---+ // ++++ ++++ ++++ ---+
m_sound->write(space, 0, data, mem_mask); m_sound->write(space, 0, data, 0xff);
if (VERBOSE>7) LOG("genboard: Write sound <- %02x\n", data); if (VERBOSE>7) LOG("genboard: Write sound <- %02x\n", data);
break; break;
@ -525,7 +524,7 @@ WRITE8_MEMBER( geneve_mapper_device::writem )
// ++++ ++-- ---- ---+ // ++++ ++-- ---- ---+
// 1000 1100 0000 00c0 // 1000 1100 0000 00c0
// Initialize waitstate timer // Initialize waitstate timer
m_video->write(space, dec->offset, data, mem_mask); m_video->write(space, dec->offset, data, 0xff);
if (VERBOSE>7) LOG("genboard: Write video %04x <- %02x\n", offset, data); if (VERBOSE>7) LOG("genboard: Write video %04x <- %02x\n", offset, data);
break; break;
@ -534,7 +533,7 @@ WRITE8_MEMBER( geneve_mapper_device::writem )
// ++++ ++-- ---- ---+ // ++++ ++-- ---- ---+
// 1001 0100 0000 0000 // 1001 0100 0000 0000
// We need to add the address prefix bits // We need to add the address prefix bits
m_peribox->write(space, dec->offset, data, mem_mask); m_peribox->write(space, dec->offset, data, 0xff);
if (VERBOSE>7) LOG("genboard: Write speech <- %02x\n", data); if (VERBOSE>7) LOG("genboard: Write speech <- %02x\n", data);
break; break;
@ -542,7 +541,7 @@ WRITE8_MEMBER( geneve_mapper_device::writem )
// grom simulation // grom simulation
// ++++ ++-- ---- ---+ // ++++ ++-- ---- ---+
// 1001 1100 0000 00c0 // 1001 1100 0000 00c0
write_grom(space, dec->offset, data, mem_mask); write_grom(space, dec->offset, data, 0xff);
if (VERBOSE>7) LOG("genboard: Write GROM %04x <- %02x\n", offset, data); if (VERBOSE>7) LOG("genboard: Write GROM %04x <- %02x\n", offset, data);
break; break;
@ -550,7 +549,7 @@ WRITE8_MEMBER( geneve_mapper_device::writem )
// sound // sound
// ++++ ++-- ---- ---+ // ++++ ++-- ---- ---+
// 1000 0100 0000 0000 // 1000 0100 0000 0000
m_sound->write(space, 0, data, mem_mask); m_sound->write(space, 0, data, 0xff);
if (VERBOSE>7) LOG("genboard: Write sound <- %02x\n", data); if (VERBOSE>7) LOG("genboard: Write sound <- %02x\n", data);
break; break;
@ -587,7 +586,7 @@ WRITE8_MEMBER( geneve_mapper_device::writem )
case MPGBOX: case MPGBOX:
dec->physaddr = (dec->physaddr & 0x0007ffff); // 19 bit address dec->physaddr = (dec->physaddr & 0x0007ffff); // 19 bit address
if (VERBOSE>7) LOG("genboard: Write P-Box %04x (%06x) <- %02x\n", offset, dec->physaddr, data); if (VERBOSE>7) LOG("genboard: Write P-Box %04x (%06x) <- %02x\n", offset, dec->physaddr, data);
m_peribox->write(space, dec->physaddr, data, mem_mask); m_peribox->write(space, dec->physaddr, data, 0xff);
break; break;
case MPGMDRAM: case MPGMDRAM:
@ -603,7 +602,7 @@ WRITE8_MEMBER( geneve_mapper_device::writem )
case MPGMBOX: case MPGMBOX:
// Route everything else to the P-Box // Route everything else to the P-Box
m_peribox->write(space, dec->physaddr, data, mem_mask); m_peribox->write(space, dec->physaddr, data, 0xff);
break; break;
} }
} }
@ -1044,9 +1043,9 @@ SETOFFSET_MEMBER( geneve_mapper_device::setoffset )
The mapper is connected to the clock line in order to operate The mapper is connected to the clock line in order to operate
the wait state counter. the wait state counter.
*/ */
void geneve_mapper_device::clock_in(int clock) WRITE_LINE_MEMBER( geneve_mapper_device::clock_in )
{ {
if (clock==ASSERT_LINE && m_waitcount!=0) if (state==ASSERT_LINE && m_waitcount!=0)
{ {
if (VERBOSE>5) LOG("genboard: clock\n"); if (VERBOSE>5) LOG("genboard: clock\n");
m_waitcount--; m_waitcount--;
@ -1057,7 +1056,7 @@ void geneve_mapper_device::clock_in(int clock)
/* /*
We need the DBIN line for the setoffset operation. We need the DBIN line for the setoffset operation.
*/ */
void geneve_mapper_device::dbin(int state) WRITE_LINE_MEMBER( geneve_mapper_device::dbin_in )
{ {
m_read_mode = (state==ASSERT_LINE); m_read_mode = (state==ASSERT_LINE);
if (VERBOSE>7) LOG("genboard: dbin = %02x\n", m_read_mode? 1:0); if (VERBOSE>7) LOG("genboard: dbin = %02x\n", m_read_mode? 1:0);

4
src/mess/machine/ti99/genboard.h
View File

@ -139,8 +139,8 @@ public:
DECLARE_INPUT_CHANGED_MEMBER( gm_changed ); DECLARE_INPUT_CHANGED_MEMBER( gm_changed );
void clock_in(int state); DECLARE_WRITE_LINE_MEMBER( clock_in );
void dbin(int state); DECLARE_WRITE_LINE_MEMBER( dbin_in );
protected: protected:
virtual void device_start(); virtual void device_start();

4
src/mess/machine/ti99/gromport.c
View File

@ -245,7 +245,7 @@ ti99_cartridge_connector_device::ti99_cartridge_connector_device(const machine_c
{ {
} }
void ti99_cartridge_connector_device::ready_line(int state) WRITE_LINE_MEMBER( ti99_cartridge_connector_device::ready_line )
{ {
m_gromport->ready_line(state); m_gromport->ready_line(state);
} }
@ -1352,7 +1352,7 @@ void ti99_cartridge_device::cruwrite(offs_t offset, UINT8 data)
if (m_pcb != NULL) m_pcb->cruwrite(offset, data); if (m_pcb != NULL) m_pcb->cruwrite(offset, data);
} }
void ti99_cartridge_device::ready_line(int state) WRITE_LINE_MEMBER( ti99_cartridge_device::ready_line )
{ {
m_connector->ready_line(state); m_connector->ready_line(state);
} }

4
src/mess/machine/ti99/gromport.h
View File

@ -78,7 +78,7 @@ public:
void crureadz(offs_t offset, UINT8 *value); void crureadz(offs_t offset, UINT8 *value);
void cruwrite(offs_t offset, UINT8 data); void cruwrite(offs_t offset, UINT8 data);
void ready_line(int state); DECLARE_WRITE_LINE_MEMBER(ready_line);
bool is_available() { return m_pcb != NULL; } bool is_available() { return m_pcb != NULL; }
bool has_grom(); bool has_grom();
void set_slot(int i); void set_slot(int i);
@ -135,7 +135,7 @@ public:
virtual void crureadz(offs_t offset, UINT8 *value) =0; virtual void crureadz(offs_t offset, UINT8 *value) =0;
virtual void cruwrite(offs_t offset, UINT8 data) =0; virtual void cruwrite(offs_t offset, UINT8 data) =0;
void ready_line(int state); DECLARE_WRITE_LINE_MEMBER(ready_line);
virtual void insert(int index, ti99_cartridge_device* cart) { m_gromport->cartridge_inserted(); }; virtual void insert(int index, ti99_cartridge_device* cart) { m_gromport->cartridge_inserted(); };
virtual void remove(int index) { }; virtual void remove(int index) { };

4
src/mess/machine/ti99/peribox.c
View File

@ -602,12 +602,12 @@ void peribox_slot_device::cruwrite(offs_t offset, UINT8 data)
m_card->cruwrite(offset, data); m_card->cruwrite(offset, data);
} }
void peribox_slot_device::senila(int state) WRITE_LINE_MEMBER( peribox_slot_device::senila )
{ {
m_card->set_senila(state); m_card->set_senila(state);
} }
void peribox_slot_device::senilb(int state) WRITE_LINE_MEMBER( peribox_slot_device::senilb )
{ {
m_card->set_senilb(state); m_card->set_senilb(state);
} }