Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-29 11:30:28 +03:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

tms6100: modernized theTMS6100 and M58819 devices. [Osso]

Browse Source
This commit is contained in:
Fabio Priuli 2013-05-29 13:03:48 +00:00
parent 1dc566e922
commit f3c89aced2
4 changed files with 168 additions and 241 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

321
src/emu/machine/tms6100.c
View File

@ -73,203 +73,24 @@
#define TMS6100_READ_PENDING 0x01 #define TMS6100_READ_PENDING 0x01
#define TMS6100_NEXT_READ_IS_DUMMY 0x02 #define TMS6100_NEXT_READ_IS_DUMMY 0x02
struct tms6100_state
{
/* Rom interface */
UINT32 address;
UINT32 address_latch;
UINT8 loadptr;
UINT8 m0;
UINT8 m1;
UINT8 addr_bits;
UINT8 clock;
UINT8 data;
UINT8 state;
const UINT8 *rom;
device_t *device;
#if 0
const tms5110_interface *intf;
#endif
};
/**********************************************************************************************
get_safe_token -- get tms6100_state
***********************************************************************************************/
INLINE tms6100_state *get_safe_token(device_t *device)
{
assert(device != NULL);
assert(device->type() == TMS6100 ||
device->type() == M58819);
return (tms6100_state *)downcast<tms6100_device *>(device)->token();
}
/**********************************************************************************************
register_save_states -- register state vars for saving
***********************************************************************************************/
static void register_for_save_states(tms6100_state *tms)
{
tms->device->save_item(NAME(tms->addr_bits));
tms->device->save_item(NAME(tms->address));
tms->device->save_item(NAME(tms->address_latch));
tms->device->save_item(NAME(tms->data));
tms->device->save_item(NAME(tms->loadptr));
tms->device->save_item(NAME(tms->m0));
tms->device->save_item(NAME(tms->m1));
tms->device->save_item(NAME(tms->state));
}
/******************************************************************************
DEVICE_START( tms6100 ) -- allocate buffers and reset the 6100
******************************************************************************/
static DEVICE_START( tms6100 )
{
//static const tms5110_interface dummy = { 0 };
tms6100_state *tms = get_safe_token(device);
assert_always(tms != NULL, "Error creating TMS6100 chip");
//tms->intf = device->static_config ? (const tms5110_interface *)device->static_config : &dummy;
tms->rom = *device->region();
tms->device = device;
register_for_save_states(tms);
}
static DEVICE_START( m58819 )
{
//tms6100_state *tms = get_safe_token(device);
DEVICE_START_CALL( tms6100 );
//tms5110_set_variant(tms, TMS5110_IS_5100);
}
static DEVICE_RESET( tms6100 )
{
tms6100_state *tms = get_safe_token(device);
/* initialize the chip */
tms->addr_bits = 0;
tms->address = 0;
tms->address_latch = 0;
tms->loadptr = 0;
tms->m0 = 0;
tms->m1 = 0;
tms->state = 0;
tms->clock = 0;
tms->data = 0;
}
WRITE_LINE_DEVICE_HANDLER( tms6100_m0_w )
{
tms6100_state *tms = get_safe_token(device);
if (state != tms->m0)
tms->m0 = state;
}
WRITE_LINE_DEVICE_HANDLER( tms6100_m1_w )
{
tms6100_state *tms = get_safe_token(device);
if (state != tms->m1)
tms->m1 = state;
}
WRITE_LINE_DEVICE_HANDLER( tms6100_romclock_w )
{
tms6100_state *tms = get_safe_token(device);
/* process on falling edge */
if (tms->clock && !state)
{
switch ((tms->m1<<1) | tms->m0)
{
case 0x00:
/* NOP in datasheet, not really ... */
if (tms->state & TMS6100_READ_PENDING)
{
if (tms->state & TMS6100_NEXT_READ_IS_DUMMY)
{
tms->address = (tms->address_latch << 3);
tms->address_latch = 0;
tms->loadptr = 0;
tms->state &= ~TMS6100_NEXT_READ_IS_DUMMY;
LOG(("loaded address %08x\n", tms->address));
}
else
{
/* read bit at address */
tms->data = (tms->rom[tms->address >> 3] >> ((tms->address & 0x07) ^ 0x07)) & 1;
tms->address++;
}
tms->state &= ~TMS6100_READ_PENDING;
}
break;
case 0x01:
/* READ */
tms->state |= TMS6100_READ_PENDING;
break;
case 0x02:
/* LOAD ADDRESS */
tms->state |= TMS6100_NEXT_READ_IS_DUMMY;
tms->address_latch |= (tms->addr_bits << tms->loadptr);
LOG(("loaded address latch %08x\n", tms->address_latch));
tms->loadptr += 4;
break;
case 0x03:
/* READ AND BRANCH */
if (tms->state & TMS6100_NEXT_READ_IS_DUMMY)
{
tms->state &= ~TMS6100_NEXT_READ_IS_DUMMY; // clear - no dummy read according to datasheet
LOG(("loaded address latch %08x\n", tms->address_latch));
tms->address = tms->rom[tms->address_latch] | (tms->rom[tms->address_latch+1]<<8);
tms->address &= 0x3fff; // 14 bits
LOG(("loaded indirect address %04x\n", tms->address));
tms->address = (tms->address << 3);
tms->address_latch = 0;
tms->loadptr = 0;
}
break;
}
}
tms->clock = state;
}
WRITE8_DEVICE_HANDLER( tms6100_addr_w )
{
tms6100_state *tms = get_safe_token(device);
if (data != tms->addr_bits)
tms->addr_bits = data;
}
READ_LINE_DEVICE_HANDLER( tms6100_data_r )
{
tms6100_state *tms = get_safe_token(device);
return tms->data;
}
const device_type TMS6100 = &device_creator<tms6100_device>; const device_type TMS6100 = &device_creator<tms6100_device>;
tms6100_device::tms6100_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, type, name, tag, owner, clock)
{
}
tms6100_device::tms6100_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) tms6100_device::tms6100_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TMS6100, "TMS6100", tag, owner, clock) : device_t(mconfig, TMS6100, "TMS6100", tag, owner, clock)
{ {
m_token = global_alloc_clear(tms6100_state);
} }
tms6100_device::tms6100_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, type, name, tag, owner, clock) const device_type M58819 = &device_creator<m58819_device>;
m58819_device::m58819_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: tms6100_device(mconfig, M58819, "M58819", tag, owner, clock)
{ {
m_token = global_alloc_clear(tms6100_state);
} }
//------------------------------------------------- //-------------------------------------------------
@ -288,7 +109,28 @@ void tms6100_device::device_config_complete()
void tms6100_device::device_start() void tms6100_device::device_start()
{ {
DEVICE_START_NAME( tms6100 )(this); //static const tms5110_interface dummy = { 0 };
//tms->intf = device->static_config ? (const tms5110_interface *)device->static_config : &dummy;
m_rom = *region();
// save device variables
save_item(NAME(m_addr_bits));
save_item(NAME(m_address));
save_item(NAME(m_address_latch));
save_item(NAME(m_tms_clock));
save_item(NAME(m_data));
save_item(NAME(m_loadptr));
save_item(NAME(m_m0));
save_item(NAME(m_m1));
save_item(NAME(m_state));
}
void m58819_device::device_start()
{
//tms5110_set_variant(tms, TMS5110_IS_5100);
tms6100_device::device_start();
} }
//------------------------------------------------- //-------------------------------------------------
@ -297,22 +139,97 @@ void tms6100_device::device_start()
void tms6100_device::device_reset() void tms6100_device::device_reset()
{ {
DEVICE_RESET_NAME( tms6100 )(this); /* initialize the chip */
m_addr_bits = 0;
m_address = 0;
m_address_latch = 0;
m_loadptr = 0;
m_m0 = 0;
m_m1 = 0;
m_state = 0;
m_tms_clock = 0;
m_data = 0;
} }
WRITE_LINE_MEMBER(tms6100_device::tms6100_m0_w)
const device_type M58819 = &device_creator<m58819_device>;
m58819_device::m58819_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: tms6100_device(mconfig, M58819, "M58819", tag, owner, clock)
{ {
if (state != m_m0)
m_m0 = state;
} }
//------------------------------------------------- WRITE_LINE_MEMBER(tms6100_device::tms6100_m1_w)
// device_start - device-specific startup
//-------------------------------------------------
void m58819_device::device_start()
{ {
DEVICE_START_NAME( m58819 )(this); if (state != m_m1)
m_m1 = state;
} }
WRITE_LINE_MEMBER(tms6100_device::tms6100_romclock_w)
{
/* process on falling edge */
if (m_tms_clock && !state)
{
switch ((m_m1<<1) | m_m0)
{
case 0x00:
/* NOP in datasheet, not really ... */
if (m_state & TMS6100_READ_PENDING)
{
if (m_state & TMS6100_NEXT_READ_IS_DUMMY)
{
m_address = (m_address_latch << 3);
m_address_latch = 0;
m_loadptr = 0;
m_state &= ~TMS6100_NEXT_READ_IS_DUMMY;
LOG(("loaded address %08x\n", m_address));
}
else
{
/* read bit at address */
m_data = (m_rom[m_address >> 3] >> ((m_address & 0x07) ^ 0x07)) & 1;
m_address++;
}
m_state &= ~TMS6100_READ_PENDING;
}
break;
case 0x01:
/* READ */
m_state |= TMS6100_READ_PENDING;
break;
case 0x02:
/* LOAD ADDRESS */
m_state |= TMS6100_NEXT_READ_IS_DUMMY;
m_address_latch |= (m_addr_bits << m_loadptr);
LOG(("loaded address latch %08x\n", m_address_latch));
m_loadptr += 4;
break;
case 0x03:
/* READ AND BRANCH */
if (m_state & TMS6100_NEXT_READ_IS_DUMMY)
{
m_state &= ~TMS6100_NEXT_READ_IS_DUMMY; // clear - no dummy read according to datasheet
LOG(("loaded address latch %08x\n", m_address_latch));
m_address = m_rom[m_address_latch] | (m_rom[m_address_latch+1]<<8);
m_address &= 0x3fff; // 14 bits
LOG(("loaded indirect address %04x\n", m_address));
m_address = (m_address << 3);
m_address_latch = 0;
m_loadptr = 0;
}
break;
}
}
m_tms_clock = state;
}
WRITE8_MEMBER(tms6100_device::tms6100_addr_w)
{
if (data != m_addr_bits)
m_addr_bits = data;
}
READ_LINE_MEMBER(tms6100_device::tms6100_data_r)
{
return m_data;
}

33
src/emu/machine/tms6100.h
View File

@ -3,26 +3,21 @@
#ifndef __TMS6100_H__ #ifndef __TMS6100_H__
#define __TMS6100_H__ #define __TMS6100_H__
#include "devlegcy.h"
/* TMS 6100 memory controller */ /* TMS 6100 memory controller */
WRITE_LINE_DEVICE_HANDLER( tms6100_m0_w );
WRITE_LINE_DEVICE_HANDLER( tms6100_m1_w );
WRITE_LINE_DEVICE_HANDLER( tms6100_romclock_w );
DECLARE_WRITE8_DEVICE_HANDLER( tms6100_addr_w );
READ_LINE_DEVICE_HANDLER( tms6100_data_r );
class tms6100_device : public device_t class tms6100_device : public device_t
{ {
public: public:
tms6100_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); tms6100_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
tms6100_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock); tms6100_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
~tms6100_device() { global_free(m_token); }
// access to legacy token DECLARE_WRITE_LINE_MEMBER( tms6100_m0_w );
void *token() const { assert(m_token != NULL); return m_token; } DECLARE_WRITE_LINE_MEMBER( tms6100_m1_w );
DECLARE_WRITE_LINE_MEMBER( tms6100_romclock_w );
DECLARE_WRITE8_MEMBER( tms6100_addr_w );
DECLARE_READ_LINE_MEMBER( tms6100_data_r );
protected: protected:
// device-level overrides // device-level overrides
virtual void device_config_complete(); virtual void device_config_complete();
@ -30,7 +25,18 @@ protected:
virtual void device_reset(); virtual void device_reset();
private: private:
// internal state // internal state
void *m_token; UINT32 m_address;
UINT32 m_address_latch;
UINT8 m_loadptr;
UINT8 m_m0;
UINT8 m_m1;
UINT8 m_addr_bits;
UINT8 m_tms_clock;
UINT8 m_data;
UINT8 m_state;
const UINT8 *m_rom;
}; };
extern const device_type TMS6100; extern const device_type TMS6100;
@ -39,6 +45,7 @@ class m58819_device : public tms6100_device
{ {
public: public:
m58819_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); m58819_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected: protected:
// device-level overrides // device-level overrides
virtual void device_start(); virtual void device_start();

11
src/mame/audio/dkong.c
View File

@ -6,7 +6,6 @@
#include "machine/latch8.h" #include "machine/latch8.h"
#include "sound/tms5110.h" #include "sound/tms5110.h"
#include "machine/tms6100.h"
#include "includes/dkong.h" #include "includes/dkong.h"
@ -1354,11 +1353,11 @@ static const nes_interface nes_interface_2 = { "n2a03b" };
const tms5110_interface tms_interface = { const tms5110_interface tms_interface = {
NULL, NULL,
NULL, NULL,
DEVCB_DEVICE_LINE("m58819", tms6100_m0_w), DEVCB_DEVICE_LINE_MEMBER("m58819", tms6100_device, tms6100_m0_w),
DEVCB_DEVICE_LINE("m58819", tms6100_m1_w), DEVCB_DEVICE_LINE_MEMBER("m58819", tms6100_device, tms6100_m1_w),
DEVCB_DEVICE_HANDLER("m58819", tms6100_addr_w), DEVCB_DEVICE_MEMBER("m58819", tms6100_device, tms6100_addr_w),
DEVCB_DEVICE_LINE("m58819", tms6100_data_r), DEVCB_DEVICE_LINE_MEMBER("m58819", tms6100_device, tms6100_data_r),
DEVCB_DEVICE_LINE("m58819", tms6100_romclock_w) DEVCB_DEVICE_LINE_MEMBER("m58819", tms6100_device, tms6100_romclock_w)
}; };
/************************************* /*************************************

38
src/mame/includes/dkong.h
View File

@ -1,5 +1,6 @@
#include "sound/discrete.h" #include "sound/discrete.h"
#include "machine/eeprom.h" #include "machine/eeprom.h"
#include "machine/tms6100.h"
/* /*
* From the schematics: * From the schematics:
@ -81,26 +82,33 @@ class dkong_state : public driver_device
public: public:
dkong_state(const machine_config &mconfig, device_type type, const char *tag) dkong_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag), : driver_device(mconfig, type, tag),
m_video_ram(*this,"video_ram"),
m_sprite_ram(*this,"sprite_ram"),
m_dev_n2a03a(*this, "n2a03a"),
m_dev_n2a03b(*this, "n2a03b"),
m_vidhw(DKONG_BOARD),
m_discrete(*this, "discrete"),
m_maincpu(*this, "maincpu"), m_maincpu(*this, "maincpu"),
m_soundcpu(*this, "soundcpu"), m_soundcpu(*this, "soundcpu"),
m_eeprom(*this, "eeprom") { } m_eeprom(*this, "eeprom"),
m_dev_n2a03a(*this, "n2a03a"),
m_dev_n2a03b(*this, "n2a03b"),
m_m58819(*this, "m58819"),
m_discrete(*this, "discrete"),
m_video_ram(*this,"video_ram"),
m_sprite_ram(*this,"sprite_ram"),
m_vidhw(DKONG_BOARD)
{ }
/* devices */
required_device<cpu_device> m_maincpu;
optional_device<cpu_device> m_soundcpu;
optional_device<eeprom_device> m_eeprom;
optional_device<cpu_device> m_dev_n2a03a;
optional_device<cpu_device> m_dev_n2a03b;
optional_device<m58819_device> m_m58819;
device_t *m_dev_vp2; /* virtual port 2 */
device_t *m_dev_6h;
optional_device<discrete_device> m_discrete;
/* memory pointers */ /* memory pointers */
required_shared_ptr<UINT8> m_video_ram; required_shared_ptr<UINT8> m_video_ram;
required_shared_ptr<UINT8> m_sprite_ram; required_shared_ptr<UINT8> m_sprite_ram;
/* devices */
optional_device<cpu_device> m_dev_n2a03a;
optional_device<cpu_device> m_dev_n2a03b;
device_t *m_dev_vp2; /* virtual port 2 */
device_t *m_dev_6h;
/* machine states */ /* machine states */
UINT8 m_hardware_type; UINT8 m_hardware_type;
UINT8 m_nmi_mask; UINT8 m_nmi_mask;
@ -116,7 +124,6 @@ public:
emu_timer * m_scanline_timer; emu_timer * m_scanline_timer;
INT8 m_vidhw; /* Selected video hardware RS Conversion / TKG04 */ INT8 m_vidhw; /* Selected video hardware RS Conversion / TKG04 */
optional_device<discrete_device> m_discrete;
/* radar scope */ /* radar scope */
UINT8 * m_gfx4; UINT8 * m_gfx4;
@ -243,9 +250,6 @@ public:
DECLARE_READ8_MEMBER(memory_read_byte); DECLARE_READ8_MEMBER(memory_read_byte);
DECLARE_WRITE8_MEMBER(memory_write_byte); DECLARE_WRITE8_MEMBER(memory_write_byte);
required_device<cpu_device> m_maincpu;
optional_device<cpu_device> m_soundcpu;
optional_device<eeprom_device> m_eeprom;
}; };
/*----------- defined in audio/dkong.c -----------*/ /*----------- defined in audio/dkong.c -----------*/