Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-30 16:00:01 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #998 from SailorSat/master

Browse Source 
cleaned up some sega comm related stuff
This commit is contained in:
Olivier Galibert 2016-06-26 11:33:23 +02:00 committed by GitHub
commit a028a5d854
5 changed files with 65 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
src/mame/drivers/model2.cpp
View File

@ -1341,61 +1341,6 @@ READ32_MEMBER(model2_state::maxx_r)
return ROM[offset + (0x040000/4)]; return ROM[offset + (0x040000/4)];
} }
/* Network board emulation */
READ32_MEMBER(model2_state::network_r)
{
if ((mem_mask == 0xffffffff) || (mem_mask == 0x0000ffff) || (mem_mask == 0xffff0000))
{
return 0xffffffff;
}
if (offset < 0x4000/4)
{
return m_netram[offset];
}
if (mem_mask == 0x00ff0000)
{
return m_sysres<<16;
}
else if (mem_mask == 0x000000ff)
{
return m_zflagi;
}
return 0xffffffff;
}
WRITE32_MEMBER(model2_state::network_w)
{
if ((mem_mask == 0xffffffff) || (mem_mask == 0x0000ffff) || (mem_mask == 0xffff0000))
{
COMBINE_DATA(&m_netram[offset+0x4000/4]);
return;
}
if (offset < 0x4000/4)
{
COMBINE_DATA(&m_netram[offset]);
return;
}
if (mem_mask == 0x00ff0000)
{
m_sysres = data>>16;
}
else if (mem_mask == 0x000000ff)
{
m_zflagi = data;
m_zflag = 0;
if (data & 0x01) m_zflag |= 0x80;
if (data & 0x80) m_zflag |= 0x01;
}
}
#ifdef UNUSED_FUNCTION #ifdef UNUSED_FUNCTION
WRITE32_MEMBER(model2_state::copro_w) WRITE32_MEMBER(model2_state::copro_w)
{ {
@ -5937,49 +5882,15 @@ DRIVER_INIT_MEMBER(model2_state,daytonam)
m_maincpu->space(AS_PROGRAM).install_read_handler(0x240000, 0x24ffff, read32_delegate(FUNC(model2_state::maxx_r),this)); m_maincpu->space(AS_PROGRAM).install_read_handler(0x240000, 0x24ffff, read32_delegate(FUNC(model2_state::maxx_r),this));
} }
/* very crude support for let the game set itself into stand-alone mode */
READ32_MEMBER(model2_state::jaleco_network_r)
{
if(offset == 0x4000/4)
{
if(m_netram[offset] == 0x00000000)
m_jnet_time_out = 0;
if((m_netram[offset] & 0xffff) == 0x0001)
m_jnet_time_out++;
if(m_jnet_time_out > 0x80)
m_netram[offset]|= 0x00800000;
return m_netram[offset];
}
return m_netram[offset];
}
WRITE32_MEMBER(model2_state::jaleco_network_w)
{
COMBINE_DATA(&m_netram[offset]);
}
DRIVER_INIT_MEMBER(model2_state,sgt24h) DRIVER_INIT_MEMBER(model2_state,sgt24h)
{ {
// DRIVER_INIT_CALL(genprot); // DRIVER_INIT_CALL(genprot);
//m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x01a10000, 0x01a1ffff, read32_delegate(FUNC(model2_state::jaleco_network_r),this), write32_delegate(FUNC(model2_state::jaleco_network_w),this));
UINT32 *ROM = (UINT32 *)memregion("maincpu")->base(); UINT32 *ROM = (UINT32 *)memregion("maincpu")->base();
ROM[0x56578/4] = 0x08000004; ROM[0x56578/4] = 0x08000004;
//ROM[0x5b3e8/4] = 0x08000004; //ROM[0x5b3e8/4] = 0x08000004;
} }
DRIVER_INIT_MEMBER(model2_state,overrev)
{
//m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x01a10000, 0x01a1ffff, read32_delegate(FUNC(model2_state::jaleco_network_r),this), write32_delegate(FUNC(model2_state::jaleco_network_w),this));
}
DRIVER_INIT_MEMBER(model2_state,doa) DRIVER_INIT_MEMBER(model2_state,doa)
{ {
m_0229crypt->install_doa_protection(); m_0229crypt->install_doa_protection();
@ -6051,7 +5962,7 @@ GAME( 1996, von, 0, model2b, model2, driver_device, 0, R
GAME( 1996, vonj, von, model2b, model2, driver_device, 0, ROT0, "Sega", "Cyber Troopers Virtual-On (Japan, Revision B)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS ) GAME( 1996, vonj, von, model2b, model2, driver_device, 0, ROT0, "Sega", "Cyber Troopers Virtual-On (Japan, Revision B)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
GAME( 1996, dynabb, 0, model2b, model2, driver_device, 0, ROT0, "Sega", "Dynamite Baseball", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS ) GAME( 1996, dynabb, 0, model2b, model2, driver_device, 0, ROT0, "Sega", "Dynamite Baseball", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
GAME( 1997, dynabb97, 0, model2b, model2, driver_device, 0, ROT0, "Sega", "Dynamite Baseball 97 (Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS ) GAME( 1997, dynabb97, 0, model2b, model2, driver_device, 0, ROT0, "Sega", "Dynamite Baseball 97 (Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
GAME( 1997, overrevb, overrev, model2b, srallyc, model2_state, overrev, ROT0, "Jaleco", "Over Rev (Model 2B, Revision B)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS ) GAME( 1997, overrevb, overrev, model2b, srallyc, driver_device, 0, ROT0, "Jaleco", "Over Rev (Model 2B, Revision B)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
GAME( 1997, zerogun, 0, model2b_5881, model2, model2_state, zerogun, ROT0, "Psikyo", "Zero Gunner (Export, Model 2B)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS ) GAME( 1997, zerogun, 0, model2b_5881, model2, model2_state, zerogun, ROT0, "Psikyo", "Zero Gunner (Export, Model 2B)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
GAME( 1997, zerogunj, zerogun, model2b_5881, model2, model2_state, zerogun, ROT0, "Psikyo", "Zero Gunner (Japan, Model 2B)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS ) GAME( 1997, zerogunj, zerogun, model2b_5881, model2, model2_state, zerogun, ROT0, "Psikyo", "Zero Gunner (Japan, Model 2B)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
GAME( 1998, dynamcopb,dynamcop, model2b_5881, model2, model2_state, genprot, ROT0, "Sega", "Dynamite Cop (Export, Model 2B)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS ) GAME( 1998, dynamcopb,dynamcop, model2b_5881, model2, model2_state, genprot, ROT0, "Sega", "Dynamite Cop (Export, Model 2B)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
@ -6066,7 +5977,7 @@ GAME( 1996, stccb, stcc, stcc, model2, driver_device, 0, R
GAME( 1996, stcca, stcc, stcc, model2, driver_device, 0, ROT0, "Sega", "Sega Touring Car Championship (Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS ) GAME( 1996, stcca, stcc, stcc, model2, driver_device, 0, ROT0, "Sega", "Sega Touring Car Championship (Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
GAME( 1996, waverunr, 0, model2c, model2, driver_device, 0, ROT0, "Sega", "Wave Runner (Japan, Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS ) GAME( 1996, waverunr, 0, model2c, model2, driver_device, 0, ROT0, "Sega", "Wave Runner (Japan, Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
GAME( 1997, hotd, 0, model2c, model2, driver_device, 0, ROT0, "Sega", "House of the Dead", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS ) GAME( 1997, hotd, 0, model2c, model2, driver_device, 0, ROT0, "Sega", "House of the Dead", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
GAME( 1997, overrev, 0, model2c, srallyc, model2_state, overrev, ROT0, "Jaleco", "Over Rev (Model 2C, Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS ) GAME( 1997, overrev, 0, model2c, srallyc, driver_device, 0, ROT0, "Jaleco", "Over Rev (Model 2C, Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
GAME( 1997, segawski, 0, model2c, model2, driver_device, 0, ROT0, "Sega", "Sega Water Ski (Japan, Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS ) GAME( 1997, segawski, 0, model2c, model2, driver_device, 0, ROT0, "Sega", "Sega Water Ski (Japan, Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
GAME( 1997, topskatr, 0, model2c, model2, driver_device, 0, ROT0, "Sega", "Top Skater (Export, Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS ) GAME( 1997, topskatr, 0, model2c, model2, driver_device, 0, ROT0, "Sega", "Top Skater (Export, Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
GAME( 1997, topskatru,topskatr, model2c, model2, driver_device, 0, ROT0, "Sega", "Top Skater (USA, Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS ) GAME( 1997, topskatru,topskatr, model2c, model2, driver_device, 0, ROT0, "Sega", "Top Skater (USA, Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )

9
src/mame/includes/model2.h
View File

@ -103,11 +103,6 @@ public:
int m_to_68k; int m_to_68k;
int m_maxxstate; int m_maxxstate;
UINT32 m_netram[0x8000/4];
int m_zflagi;
int m_zflag;
int m_sysres;
int m_jnet_time_out;
UINT32 m_geo_read_start_address; UINT32 m_geo_read_start_address;
UINT32 m_geo_write_start_address; UINT32 m_geo_write_start_address;
model2_renderer *m_poly; model2_renderer *m_poly;
@ -163,8 +158,6 @@ public:
int first_read; int first_read;
DECLARE_READ32_MEMBER(maxx_r); DECLARE_READ32_MEMBER(maxx_r);
DECLARE_READ32_MEMBER(network_r);
DECLARE_WRITE32_MEMBER(network_w);
DECLARE_WRITE32_MEMBER(mode_w); DECLARE_WRITE32_MEMBER(mode_w);
DECLARE_WRITE32_MEMBER(model2o_tex_w0); DECLARE_WRITE32_MEMBER(model2o_tex_w0);
DECLARE_WRITE32_MEMBER(model2o_tex_w1); DECLARE_WRITE32_MEMBER(model2o_tex_w1);
@ -184,8 +177,6 @@ public:
DECLARE_READ8_MEMBER(driveio_port_r); DECLARE_READ8_MEMBER(driveio_port_r);
DECLARE_WRITE8_MEMBER(driveio_port_w); DECLARE_WRITE8_MEMBER(driveio_port_w);
DECLARE_READ8_MEMBER(driveio_port_str_r); DECLARE_READ8_MEMBER(driveio_port_str_r);
DECLARE_READ32_MEMBER(jaleco_network_r);
DECLARE_WRITE32_MEMBER(jaleco_network_w);
void push_geo_data(UINT32 data); void push_geo_data(UINT32 data);
DECLARE_DRIVER_INIT(overrev); DECLARE_DRIVER_INIT(overrev);
DECLARE_DRIVER_INIT(pltkids); DECLARE_DRIVER_INIT(pltkids);

45
src/mame/machine/m1comm.cpp
View File

@ -26,7 +26,7 @@ MODEL-1 COMMUNICATION BD 837-8842 171-6293B (C) SEGA 1992
|--------------------------------------------------------------------------------| |--------------------------------------------------------------------------------|
Notes: Notes:
15112.17 - AMD AM27C100 128k x8 EPROM (DIP32, labelled 'EPR-15112') 15112.17 - AMD AM27C100 128k x8 EPROM (DIP32, labelled 'EPR-15112')
Z80 - Zilog Z0840004PSC Z80 CPU, running at 4.000MHz (DIP40) Z80 - Zilog Z0840008PSC Z80 CPU, running at 8.000MHz (DIP40)
MB8464 - Fujitsu MB8464 8k x8 SRAM (DIP28) MB8464 - Fujitsu MB8464 8k x8 SRAM (DIP28)
MB8421 - Fujitsu MB8421-12LP 2k x8 SRAM (SDIP52) MB8421 - Fujitsu MB8421-12LP 2k x8 SRAM (SDIP52)
MB8431 - Fujitsu MB8431-90LP 2k x8 SRAM (SDIP52) MB8431 - Fujitsu MB8431-90LP 2k x8 SRAM (SDIP52)
@ -81,7 +81,7 @@ static ADDRESS_MAP_START( m1comm_io, AS_IO, 8, m1comm_device )
ADDRESS_MAP_END ADDRESS_MAP_END
MACHINE_CONFIG_FRAGMENT( m1comm ) MACHINE_CONFIG_FRAGMENT( m1comm )
MCFG_CPU_ADD(Z80_TAG, Z80, 4000000) /* 32 MHz / 8 */ MCFG_CPU_ADD(Z80_TAG, Z80, 8000000) /* 32 MHz / 4 */
MCFG_CPU_PROGRAM_MAP(m1comm_mem) MCFG_CPU_PROGRAM_MAP(m1comm_mem)
MCFG_CPU_IO_MAP(m1comm_io) MCFG_CPU_IO_MAP(m1comm_io)
MACHINE_CONFIG_END MACHINE_CONFIG_END
@ -179,7 +179,7 @@ READ8_MEMBER(m1comm_device::dlc_reg_r)
UINT8 result = m_dlc_reg[offset]; UINT8 result = m_dlc_reg[offset];
#ifdef __M1COMM_VERBOSE__ #ifdef __M1COMM_VERBOSE__
printf("m1comm-dlc_reg_r: read register %02x for value %02x\n", offset, result); osd_printf_verbose("m1comm-dlc_reg_r: read register %02x for value %02x\n", offset, result);
#endif #endif
return result; return result;
} }
@ -188,7 +188,7 @@ WRITE8_MEMBER(m1comm_device::dlc_reg_w)
{ {
m_dlc_reg[offset] = data; m_dlc_reg[offset] = data;
#ifdef __M1COMM_VERBOSE__ #ifdef __M1COMM_VERBOSE__
printf("m1comm-dlc_reg_w: write register %02x for value %02x\n", offset, data); osd_printf_verbose("m1comm-dlc_reg_w: write register %02x for value %02x\n", offset, data);
#endif #endif
} }
@ -196,7 +196,7 @@ READ8_MEMBER(m1comm_device::dma_reg_r)
{ {
UINT8 result = m_dma_reg[offset]; UINT8 result = m_dma_reg[offset];
#ifdef __M1COMM_VERBOSE__ #ifdef __M1COMM_VERBOSE__
printf("m1comm-dma_reg_r: read register %02x for value %02x\n", offset, result); osd_printf_verbose("m1comm-dma_reg_r: read register %02x for value %02x\n", offset, result);
#endif #endif
return result; return result;
} }
@ -204,7 +204,7 @@ READ8_MEMBER(m1comm_device::dma_reg_r)
WRITE8_MEMBER(m1comm_device::dma_reg_w) WRITE8_MEMBER(m1comm_device::dma_reg_w)
{ {
#ifdef __M1COMM_VERBOSE__ #ifdef __M1COMM_VERBOSE__
printf("m1comm-dma_reg_w: %02x %02x\n", offset, data); osd_printf_verbose("m1comm-dma_reg_w: %02x %02x\n", offset, data);
#endif #endif
m_dma_reg[offset] = data; m_dma_reg[offset] = data;
} }
@ -213,7 +213,7 @@ READ8_MEMBER(m1comm_device::syn_r)
{ {
UINT8 result = m_syn | 0xFC; UINT8 result = m_syn | 0xFC;
#ifdef __M1COMM_VERBOSE__ #ifdef __M1COMM_VERBOSE__
printf("m1comm-syn_r: read register %02x for value %02x\n", offset, result); osd_printf_verbose("m1comm-syn_r: read register %02x for value %02x\n", offset, result);
#endif #endif
return result; return result;
} }
@ -226,15 +226,15 @@ WRITE8_MEMBER(m1comm_device::syn_w)
switch (data & 0x02) switch (data & 0x02)
{ {
case 0x00: case 0x00:
printf("m1comm-syn_w: VINT disabled\n"); osd_printf_verbose("m1comm-syn_w: VINT disabled\n");
break; break;
case 0x02: case 0x02:
printf("m1comm-syn_w: VINT enabled\n"); osd_printf_verbose("m1comm-syn_w: VINT enabled\n");
break; break;
default: default:
printf("m1comm-syn_w: %02x\n", data); osd_printf_verbose("m1comm-syn_w: %02x\n", data);
break; break;
} }
#endif #endif
@ -244,7 +244,7 @@ READ8_MEMBER(m1comm_device::zfg_r)
{ {
UINT8 result = m_zfg | (~m_fg << 7) | 0x7e; UINT8 result = m_zfg | (~m_fg << 7) | 0x7e;
#ifdef __M1COMM_VERBOSE__ #ifdef __M1COMM_VERBOSE__
printf("m1comm-zfg_r: read register %02x for value %02x\n", offset, result); osd_printf_verbose("m1comm-zfg_r: read register %02x for value %02x\n", offset, result);
#endif #endif
return result; return result;
} }
@ -252,7 +252,7 @@ READ8_MEMBER(m1comm_device::zfg_r)
WRITE8_MEMBER(m1comm_device::zfg_w) WRITE8_MEMBER(m1comm_device::zfg_w)
{ {
#ifdef __M1COMM_VERBOSE__ #ifdef __M1COMM_VERBOSE__
printf("m1comm-zfg_w: %02x\n", data); osd_printf_verbose("m1comm-zfg_w: %02x\n", data);
#endif #endif
m_zfg = data & 0x01; m_zfg = data & 0x01;
} }
@ -285,13 +285,14 @@ WRITE8_MEMBER(m1comm_device::cn_w)
if (!m_cn) if (!m_cn)
{ {
// reset command // reset command
printf("M1COMM: board disabled\n"); osd_printf_verbose("M1COMM: board disabled\n");
m_linkenable = 0x00; m_linkenable = 0x00;
m_zfg = 0x00;
} }
else else
{ {
// init command // init command
printf("M1COMM: board enabled\n"); osd_printf_verbose("M1COMM: board enabled\n");
m_linkenable = 0x01; m_linkenable = 0x01;
m_linkid = 0x00; m_linkid = 0x00;
m_linkalive = 0x00; m_linkalive = 0x00;
@ -321,7 +322,7 @@ void m1comm_device::check_vint_irq()
{ {
m_commcpu->set_input_line_and_vector(0, HOLD_LINE, 0xef); m_commcpu->set_input_line_and_vector(0, HOLD_LINE, 0xef);
#ifdef __M1COMM_VERBOSE__ #ifdef __M1COMM_VERBOSE__
printf("m1comm-INT5\n"); osd_printf_verbose("m1comm-INT5\n");
#endif #endif
} }
#else #else
@ -355,14 +356,14 @@ void m1comm_device::comm_tick()
// check rx socket // check rx socket
if (!m_line_rx.is_open()) if (!m_line_rx.is_open())
{ {
printf("M1COMM: listen on %s\n", m_localhost); osd_printf_verbose("M1COMM: listen on %s\n", m_localhost);
m_line_rx.open(m_localhost); m_line_rx.open(m_localhost);
} }
// check tx socket // check tx socket
if (!m_line_tx.is_open()) if (!m_line_tx.is_open())
{ {
printf("M1COMM: connect to %s\n", m_remotehost); osd_printf_verbose("M1COMM: connect to %s\n", m_remotehost);
m_line_tx.open(m_remotehost); m_line_tx.open(m_remotehost);
} }
@ -415,8 +416,9 @@ void m1comm_device::comm_tick()
} }
// consider it done // consider it done
printf("M1COMM: link established - id %02x of %02x\n", m_linkid, m_linkcount); osd_printf_verbose("M1COMM: link established - id %02x of %02x\n", m_linkid, m_linkcount);
m_linkalive = 0x01; m_linkalive = 0x01;
m_zfg = 0x01;
// write to shared mem // write to shared mem
m_shared[0] = 0x01; m_shared[0] = 0x01;
@ -433,7 +435,7 @@ void m1comm_device::comm_tick()
recv = m_line_rx.read(m_buffer, togo); recv = m_line_rx.read(m_buffer, togo);
togo -= recv; togo -= recv;
} }
printf("M1COMM: droped a message...\n"); osd_printf_verbose("M1COMM: droped a message...\n");
} }
if (m_linkalive == 0x00) if (m_linkalive == 0x00)
@ -461,8 +463,9 @@ void m1comm_device::comm_tick()
m_line_tx.write(m_buffer, dataSize); m_line_tx.write(m_buffer, dataSize);
// consider it done // consider it done
printf("M1COMM: link established - id %02x of %02x\n", m_linkid, m_linkcount); osd_printf_verbose("M1COMM: link established - id %02x of %02x\n", m_linkid, m_linkcount);
m_linkalive = 0x01; m_linkalive = 0x01;
m_zfg = 0x01;
// write to shared mem // write to shared mem
m_shared[0] = 0x01; m_shared[0] = 0x01;
@ -530,7 +533,7 @@ void m1comm_device::comm_tick()
recv = m_line_rx.read(m_buffer, togo); recv = m_line_rx.read(m_buffer, togo);
togo -= recv; togo -= recv;
} }
printf("M1COMM: droped a message...\n"); osd_printf_verbose("M1COMM: droped a message...\n");
} }
recv = m_line_rx.read(m_buffer, dataSize); recv = m_line_rx.read(m_buffer, dataSize);
} }

24
src/mame/machine/m2comm.cpp
View File

@ -240,7 +240,7 @@ READ8_MEMBER(m2comm_device::zfg_r)
{ {
UINT8 result = m_zfg | 0xFE; UINT8 result = m_zfg | 0xFE;
#ifdef __M2COMM_VERBOSE__ #ifdef __M2COMM_VERBOSE__
printf("m2comm-zfg_r: read register %02x for value %02x\n", offset, result); osd_printf_verbose("m2comm-zfg_r: read register %02x for value %02x\n", offset, result);
#endif #endif
return result; return result;
} }
@ -248,7 +248,7 @@ READ8_MEMBER(m2comm_device::zfg_r)
WRITE8_MEMBER(m2comm_device::zfg_w) WRITE8_MEMBER(m2comm_device::zfg_w)
{ {
#ifdef __M2COMM_VERBOSE__ #ifdef __M2COMM_VERBOSE__
printf("m2comm-zfg_w: %02x\n", data); osd_printf_verbose("m2comm-zfg_w: %02x\n", data);
#endif #endif
m_zfg = data & 0x01; m_zfg = data & 0x01;
} }
@ -257,7 +257,7 @@ READ8_MEMBER(m2comm_device::share_r)
{ {
UINT8 result = m_shared[offset]; UINT8 result = m_shared[offset];
#ifdef __M2COMM_VERBOSE__ #ifdef __M2COMM_VERBOSE__
printf("m2comm-share_r: read shared memory %02x for value %02x\n", offset, result); osd_printf_verbose("m2comm-share_r: read shared memory %02x for value %02x\n", offset, result);
#endif #endif
return result; return result;
} }
@ -265,7 +265,7 @@ READ8_MEMBER(m2comm_device::share_r)
WRITE8_MEMBER(m2comm_device::share_w) WRITE8_MEMBER(m2comm_device::share_w)
{ {
#ifdef __M2COMM_VERBOSE__ #ifdef __M2COMM_VERBOSE__
printf("m2comm-share_w: %02x %02x\n", offset, data); osd_printf_verbose("m2comm-share_w: %02x %02x\n", offset, data);
#endif #endif
m_shared[offset] = data; m_shared[offset] = data;
} }
@ -286,13 +286,13 @@ WRITE8_MEMBER(m2comm_device::cn_w)
if (!m_cn) if (!m_cn)
{ {
// reset command // reset command
printf("M2COMM: board disabled\n"); osd_printf_verbose("M2COMM: board disabled\n");
m_linkenable = 0x00; m_linkenable = 0x00;
} }
else else
{ {
// init command // init command
printf("M2COMM: board enabled\n"); osd_printf_verbose("M2COMM: board enabled\n");
m_linkenable = 0x01; m_linkenable = 0x01;
m_linkid = 0x00; m_linkid = 0x00;
m_linkalive = 0x00; m_linkalive = 0x00;
@ -368,14 +368,14 @@ void m2comm_device::comm_tick()
// check rx socket // check rx socket
if (!m_line_rx.is_open()) if (!m_line_rx.is_open())
{ {
printf("M2COMM: listen on %s\n", m_localhost); osd_printf_verbose("M2COMM: listen on %s\n", m_localhost);
m_line_rx.open(m_localhost); m_line_rx.open(m_localhost);
} }
// check tx socket // check tx socket
if (!m_line_tx.is_open()) if (!m_line_tx.is_open())
{ {
printf("M2COMM: connect to %s\n", m_remotehost); osd_printf_verbose("M2COMM: connect to %s\n", m_remotehost);
m_line_tx.open(m_remotehost); m_line_tx.open(m_remotehost);
} }
@ -427,7 +427,7 @@ void m2comm_device::comm_tick()
} }
// consider it done // consider it done
printf("M2COMM: link established - id %02x of %02x\n", m_linkid, m_linkcount); osd_printf_verbose("M2COMM: link established - id %02x of %02x\n", m_linkid, m_linkcount);
m_linkalive = 0x01; m_linkalive = 0x01;
m_linktimer = 0x01; m_linktimer = 0x01;
@ -446,7 +446,7 @@ void m2comm_device::comm_tick()
recv = m_line_rx.read(m_buffer, togo); recv = m_line_rx.read(m_buffer, togo);
togo -= recv; togo -= recv;
} }
printf("M2COMM: droped a message...\n"); osd_printf_verbose("M2COMM: droped a message...\n");
} }
if (m_linkalive == 0x00) if (m_linkalive == 0x00)
@ -476,7 +476,7 @@ void m2comm_device::comm_tick()
m_line_tx.write(m_buffer, dataSize); m_line_tx.write(m_buffer, dataSize);
// consider it done // consider it done
printf("M2COMM: link established - id %02x of %02x\n", m_linkid, m_linkcount); osd_printf_verbose("M2COMM: link established - id %02x of %02x\n", m_linkid, m_linkcount);
m_linkalive = 0x01; m_linkalive = 0x01;
m_linktimer = 0x00; m_linktimer = 0x00;
@ -527,7 +527,7 @@ void m2comm_device::comm_tick()
recv = m_line_rx.read(m_buffer, togo); recv = m_line_rx.read(m_buffer, togo);
togo -= recv; togo -= recv;
} }
printf("M2COMM: droped a message...\n"); osd_printf_verbose("M2COMM: droped a message...\n");
} }
recv = m_line_rx.read(m_buffer, dataSize); recv = m_line_rx.read(m_buffer, dataSize);
} }

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

@ -142,7 +142,7 @@ READ8_MEMBER(s32comm_device::zfg_r)
{ {
UINT8 result = m_zfg | 0xFE; UINT8 result = m_zfg | 0xFE;
#ifdef __S32COMM_VERBOSE__ #ifdef __S32COMM_VERBOSE__
printf("s32comm-zfg_r: read register %02x for value %02x\n", offset, result); osd_printf_verbose("s32comm-zfg_r: read register %02x for value %02x\n", offset, result);
#endif #endif
return result; return result;
} }
@ -150,7 +150,7 @@ READ8_MEMBER(s32comm_device::zfg_r)
WRITE8_MEMBER(s32comm_device::zfg_w) WRITE8_MEMBER(s32comm_device::zfg_w)
{ {
#ifdef __S32COMM_VERBOSE__ #ifdef __S32COMM_VERBOSE__
printf("s32comm-zfg_w: %02x\n", data); osd_printf_verbose("s32comm-zfg_w: %02x\n", data);
#endif #endif
m_zfg = data & 0x01; m_zfg = data & 0x01;
} }
@ -159,7 +159,7 @@ READ8_MEMBER(s32comm_device::share_r)
{ {
UINT8 result = m_shared[offset]; UINT8 result = m_shared[offset];
#ifdef __S32COMM_VERBOSE__ #ifdef __S32COMM_VERBOSE__
printf("s32comm-share_r: read shared memory %02x for value %02x\n", offset, result); osd_printf_verbose("s32comm-share_r: read shared memory %02x for value %02x\n", offset, result);
#endif #endif
return result; return result;
} }
@ -167,7 +167,7 @@ READ8_MEMBER(s32comm_device::share_r)
WRITE8_MEMBER(s32comm_device::share_w) WRITE8_MEMBER(s32comm_device::share_w)
{ {
#ifdef __S32COMM_VERBOSE__ #ifdef __S32COMM_VERBOSE__
printf("s32comm-share_w: %02x %02x\n", offset, data); osd_printf_verbose("s32comm-share_w: %02x %02x\n", offset, data);
#endif #endif
m_shared[offset] = data; m_shared[offset] = data;
} }
@ -188,13 +188,13 @@ WRITE8_MEMBER(s32comm_device::cn_w)
if (!m_cn) if (!m_cn)
{ {
// reset command // reset command
printf("S32COMM: board disabled\n"); osd_printf_verbose("S32COMM: board disabled\n");
m_linkenable = 0x00; m_linkenable = 0x00;
} }
else else
{ {
// init command // init command
printf("S32COMM: board enabled\n"); osd_printf_verbose("S32COMM: board enabled\n");
m_linkenable = 0x01; m_linkenable = 0x01;
m_linkid = 0x00; m_linkid = 0x00;
m_linkalive = 0x00; m_linkalive = 0x00;
@ -236,15 +236,15 @@ void s32comm_device::set_linktype(UINT16 linktype)
{ {
case 14084: case 14084:
// Rad Rally // Rad Rally
printf("S32COMM: set mode 'EPR-14084 - Rad Rally'\n"); osd_printf_verbose("S32COMM: set mode 'EPR-14084 - Rad Rally'\n");
break; break;
case 15033: case 15033:
// Stadium Cross / OutRunners // Stadium Cross / OutRunners
printf("S32COMM: set mode 'EPR-15033 - Stadium Cross / OutRunners'\n"); osd_printf_verbose("S32COMM: set mode 'EPR-15033 - Stadium Cross / OutRunners'\n");
break; break;
case 15612: case 15612:
// F1 Super Lap // F1 Super Lap
printf("S32COMM: set mode 'EPR-15612 - F1 Super Lap'\n"); osd_printf_verbose("S32COMM: set mode 'EPR-15612 - F1 Super Lap'\n");
break; break;
} }
} }
@ -293,14 +293,14 @@ void s32comm_device::comm_tick_14084()
// check rx socket // check rx socket
if (!m_line_rx.is_open()) if (!m_line_rx.is_open())
{ {
printf("S32COMM: listen on %s\n", m_localhost); osd_printf_verbose("S32COMM: listen on %s\n", m_localhost);
m_line_rx.open(m_localhost); m_line_rx.open(m_localhost);
} }
// check tx socket // check tx socket
if (!m_line_tx.is_open()) if (!m_line_tx.is_open())
{ {
printf("S32COMM: connect to %s\n", m_remotehost); osd_printf_verbose("S32COMM: connect to %s\n", m_remotehost);
m_line_tx.open(m_remotehost); m_line_tx.open(m_remotehost);
} }
@ -353,7 +353,7 @@ void s32comm_device::comm_tick_14084()
} }
// consider it done // consider it done
printf("S32COMM: link established - id %02x of %02x\n", m_linkid, m_linkcount); osd_printf_verbose("S32COMM: link established - id %02x of %02x\n", m_linkid, m_linkcount);
m_linkalive = 0x01; m_linkalive = 0x01;
// write to shared mem // write to shared mem
@ -371,7 +371,7 @@ void s32comm_device::comm_tick_14084()
recv = m_line_rx.read(m_buffer, togo); recv = m_line_rx.read(m_buffer, togo);
togo -= recv; togo -= recv;
} }
printf("S32COMM: droped a message...\n"); osd_printf_verbose("S32COMM: droped a message...\n");
} }
if (m_linkalive == 0x00) if (m_linkalive == 0x00)
@ -399,7 +399,7 @@ void s32comm_device::comm_tick_14084()
m_line_tx.write(m_buffer, dataSize); m_line_tx.write(m_buffer, dataSize);
// consider it done // consider it done
printf("S32COMM: link established - id %02x of %02x\n", m_linkid, m_linkcount); osd_printf_verbose("S32COMM: link established - id %02x of %02x\n", m_linkid, m_linkcount);
m_linkalive = 0x01; m_linkalive = 0x01;
// write to shared mem // write to shared mem
@ -468,7 +468,7 @@ void s32comm_device::comm_tick_14084()
recv = m_line_rx.read(m_buffer, togo); recv = m_line_rx.read(m_buffer, togo);
togo -= recv; togo -= recv;
} }
printf("S32COMM: droped a message...\n"); osd_printf_verbose("S32COMM: droped a message...\n");
} }
recv = m_line_rx.read(m_buffer, dataSize); recv = m_line_rx.read(m_buffer, dataSize);
} }
@ -546,14 +546,14 @@ void s32comm_device::comm_tick_15033()
// check rx socket // check rx socket
if (!m_line_rx.is_open()) if (!m_line_rx.is_open())
{ {
printf("S32COMM: listen on %s\n", m_localhost); osd_printf_verbose("S32COMM: listen on %s\n", m_localhost);
m_line_rx.open(m_localhost); m_line_rx.open(m_localhost);
} }
// check tx socket // check tx socket
if (!m_line_tx.is_open()) if (!m_line_tx.is_open())
{ {
printf("S32COMM: connect to %s\n", m_remotehost); osd_printf_verbose("S32COMM: connect to %s\n", m_remotehost);
m_line_tx.open(m_remotehost); m_line_tx.open(m_remotehost);
} }
@ -606,7 +606,7 @@ void s32comm_device::comm_tick_15033()
} }
// consider it done // consider it done
printf("S32COMM: link established - id %02x of %02x\n", m_linkid, m_linkcount); osd_printf_verbose("S32COMM: link established - id %02x of %02x\n", m_linkid, m_linkcount);
m_linkalive = 0x01; m_linkalive = 0x01;
// write to shared mem // write to shared mem
@ -624,7 +624,7 @@ void s32comm_device::comm_tick_15033()
recv = m_line_rx.read(m_buffer, togo); recv = m_line_rx.read(m_buffer, togo);
togo -= recv; togo -= recv;
} }
printf("S32COMM: droped a message...\n"); osd_printf_verbose("S32COMM: droped a message...\n");
} }
if (m_linkalive == 0x00) if (m_linkalive == 0x00)
@ -652,7 +652,7 @@ void s32comm_device::comm_tick_15033()
m_line_tx.write(m_buffer, dataSize); m_line_tx.write(m_buffer, dataSize);
// consider it done // consider it done
printf("S32COMM: link established - id %02x of %02x\n", m_linkid, m_linkcount); osd_printf_verbose("S32COMM: link established - id %02x of %02x\n", m_linkid, m_linkcount);
m_linkalive = 0x01; m_linkalive = 0x01;
// write to shared mem // write to shared mem
@ -721,7 +721,7 @@ void s32comm_device::comm_tick_15033()
recv = m_line_rx.read(m_buffer, togo); recv = m_line_rx.read(m_buffer, togo);
togo -= recv; togo -= recv;
} }
printf("S32COMM: droped a message...\n"); osd_printf_verbose("S32COMM: droped a message...\n");
} }
recv = m_line_rx.read(m_buffer, dataSize); recv = m_line_rx.read(m_buffer, dataSize);
} }
@ -787,14 +787,14 @@ void s32comm_device::comm_tick_15612()
// check rx socket // check rx socket
if (!m_line_rx.is_open()) if (!m_line_rx.is_open())
{ {
printf("S32COMM: listen on %s\n", m_localhost); osd_printf_verbose("S32COMM: listen on %s\n", m_localhost);
m_line_rx.open(m_localhost); m_line_rx.open(m_localhost);
} }
// check tx socket // check tx socket
if (!m_line_tx.is_open()) if (!m_line_tx.is_open())
{ {
printf("S32COMM: connect to %s\n", m_remotehost); osd_printf_verbose("S32COMM: connect to %s\n", m_remotehost);
m_line_tx.open(m_remotehost); m_line_tx.open(m_remotehost);
} }
@ -847,7 +847,7 @@ void s32comm_device::comm_tick_15612()
} }
// consider it done // consider it done
printf("S32COMM: link established - id %02x of %02x\n", m_linkid, m_linkcount); osd_printf_verbose("S32COMM: link established - id %02x of %02x\n", m_linkid, m_linkcount);
m_linkalive = 0x01; m_linkalive = 0x01;
// write to shared mem // write to shared mem
@ -865,7 +865,7 @@ void s32comm_device::comm_tick_15612()
recv = m_line_rx.read(m_buffer, togo); recv = m_line_rx.read(m_buffer, togo);
togo -= recv; togo -= recv;
} }
printf("S32COMM: droped a message...\n"); osd_printf_verbose("S32COMM: droped a message...\n");
} }
if (m_linkalive == 0x00) if (m_linkalive == 0x00)
@ -893,7 +893,7 @@ void s32comm_device::comm_tick_15612()
m_line_tx.write(m_buffer, dataSize); m_line_tx.write(m_buffer, dataSize);
// consider it done // consider it done
printf("S32COMM: link established - id %02x of %02x\n", m_linkid, m_linkcount); osd_printf_verbose("S32COMM: link established - id %02x of %02x\n", m_linkid, m_linkcount);
m_linkalive = 0x01; m_linkalive = 0x01;
// write to shared mem // write to shared mem
@ -962,7 +962,7 @@ void s32comm_device::comm_tick_15612()
recv = m_line_rx.read(m_buffer, togo); recv = m_line_rx.read(m_buffer, togo);
togo -= recv; togo -= recv;
} }
printf("S32COMM: droped a message...\n"); osd_printf_verbose("S32COMM: droped a message...\n");
} }
recv = m_line_rx.read(m_buffer, dataSize); recv = m_line_rx.read(m_buffer, dataSize);
} }