Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-27 18:53:05 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1514 from ajrhacker/hallelujiah

Browse Source 
amusco: Major improvements; promoted to WORKING
This commit is contained in:
Vas Crabb 2016-10-16 11:37:01 +11:00 committed by GitHub
commit d7b8adf61a
4 changed files with 107 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/devices/machine/pit8253.cpp
View File

@ -317,7 +317,7 @@ void pit8253_device::simulate2(pit8253_timer *timer, INT64 elapsed_cycles)
static const UINT32 CYCLES_NEVER = (0xffffffff); static const UINT32 CYCLES_NEVER = (0xffffffff);
UINT32 cycles_to_output = 0; UINT32 cycles_to_output = 0;
LOG2(("pit8253: simulate2(): simulating %d cycles for %d in mode %d, bcd = %d, phase = %d, gate = %d, output %d, value = 0x%04x\n", LOG2(("simulate2(): simulating %d cycles for %d in mode %d, bcd = %d, phase = %d, gate = %d, output %d, value = 0x%04x\n",
(int)elapsed_cycles, timer->index, mode, bcd, timer->phase, timer->gate, timer->output, timer->value)); (int)elapsed_cycles, timer->index, mode, bcd, timer->phase, timer->gate, timer->output, timer->value));
switch (mode) switch (mode)
@ -698,7 +698,7 @@ void pit8253_device::simulate2(pit8253_timer *timer, INT64 elapsed_cycles)
timer->updatetimer->adjust(next_fire_time - machine().time(), timer->index); timer->updatetimer->adjust(next_fire_time - machine().time(), timer->index);
} }
LOG2(("pit8253: simulate2(): simulating %d cycles for %d in mode %d, bcd = %d, phase = %d, gate = %d, output %d, value = 0x%04x, cycles_to_output = %04x\n", LOG2(("simulate2(): simulating %d cycles for %d in mode %d, bcd = %d, phase = %d, gate = %d, output %d, value = 0x%04x, cycles_to_output = %04x\n",
(int)elapsed_cycles, timer->index, mode, bcd, timer->phase, timer->gate, timer->output, timer->value, cycles_to_output)); (int)elapsed_cycles, timer->index, mode, bcd, timer->phase, timer->gate, timer->output, timer->value, cycles_to_output));
} }
@ -723,7 +723,7 @@ void pit8253_device::update(pit8253_timer *timer)
attotime elapsed_time = now - timer->last_updated; attotime elapsed_time = now - timer->last_updated;
INT64 elapsed_cycles = elapsed_time.as_double() * timer->clockin; INT64 elapsed_cycles = elapsed_time.as_double() * timer->clockin;
LOG1(("pit8253: update(): timer %d, %d elapsed_cycles\n", timer->index, elapsed_cycles)); LOG1(("update(): timer %d, %d elapsed_cycles\n", timer->index, elapsed_cycles));
if (timer->clockin) if (timer->clockin)
timer->last_updated += elapsed_cycles * attotime::from_hz(timer->clockin); timer->last_updated += elapsed_cycles * attotime::from_hz(timer->clockin);
@ -739,7 +739,7 @@ void pit8253_device::update(pit8253_timer *timer)
mask this bit off. */ mask this bit off. */
UINT16 pit8253_device::masked_value(pit8253_timer *timer) UINT16 pit8253_device::masked_value(pit8253_timer *timer)
{ {
LOG2(("pit8253: masked_value\n")); LOG2(("masked_value\n"));
if (CTRL_MODE(timer->control) == 3) if (CTRL_MODE(timer->control) == 3)
return timer->value & 0xfffe; return timer->value & 0xfffe;
return timer->value; return timer->value;
@ -756,7 +756,7 @@ READ8_MEMBER( pit8253_device::read )
UINT8 data; UINT8 data;
UINT16 value; UINT16 value;
LOG2(("pit8253_r(): offset %d\n", offset)); LOG2(("read(): offset %d\n", offset));
if (timer == nullptr) if (timer == nullptr)
{ {
@ -816,7 +816,7 @@ READ8_MEMBER( pit8253_device::read )
} }
} }
LOG2(("pit8253: read(): offset=%d data=0x%02x\n", offset, data)); LOG2(("read(): offset=%d data=0x%02x\n", offset, data));
return data; return data;
} }
@ -825,7 +825,7 @@ READ8_MEMBER( pit8253_device::read )
void pit8253_device::load_count(pit8253_timer *timer, UINT16 newcount) void pit8253_device::load_count(pit8253_timer *timer, UINT16 newcount)
{ {
int mode = CTRL_MODE(timer->control); int mode = CTRL_MODE(timer->control);
LOG1(("pit8253: load_count(): %04x\n", newcount)); LOG1(("load_count(): %04x\n", newcount));
if (newcount == 1) if (newcount == 1)
{ {
@ -912,7 +912,7 @@ void pit8253_device::readback_command(UINT8 data)
void pit8254_device::readback_command(UINT8 data) void pit8254_device::readback_command(UINT8 data)
{ {
LOG1(("pit8253: write(): readback %02x\n", data & 0x3f)); LOG1(("write(): readback %02x\n", data & 0x3f));
/* Bit 0 of data must be 0. Todo: find out what the hardware does if it isn't. */ /* Bit 0 of data must be 0. Todo: find out what the hardware does if it isn't. */
int read_command = (data >> 4) & 3; int read_command = (data >> 4) & 3;
@ -933,7 +933,7 @@ WRITE8_MEMBER( pit8253_device::write )
{ {
pit8253_timer *timer = get_timer(offset); pit8253_timer *timer = get_timer(offset);
LOG2(("pit8253: write(): offset=%d data=0x%02x\n", offset, data)); LOG2(("write(): offset=%d data=0x%02x\n", offset, data));
if (timer == nullptr) if (timer == nullptr)
{ {
@ -949,7 +949,7 @@ WRITE8_MEMBER( pit8253_device::write )
if (CTRL_ACCESS(data) == 0) if (CTRL_ACCESS(data) == 0)
{ {
LOG1(("pit8253: write(): timer=%d readback\n", (data >> 6) & 3)); LOG1(("write(): timer=%d readback\n", (data >> 6) & 3));
/* Latch current timer value */ /* Latch current timer value */
/* Experimentally verified: this command does not affect the mode control register */ /* Experimentally verified: this command does not affect the mode control register */
@ -957,7 +957,7 @@ WRITE8_MEMBER( pit8253_device::write )
} }
else else
{ {
LOG1(("pit8253: write(): timer=%d bytes=%d mode=%d bcd=%d\n", (data >> 6) & 3, (data >> 4) & 3, (data >> 1) & 7, data & 1)); LOG1(("write(): timer=%d bytes=%d mode=%d bcd=%d\n", (data >> 6) & 3, (data >> 4) & 3, (data >> 1) & 7, data & 1));
timer->control = (data & 0x3f); timer->control = (data & 0x3f);
timer->null_count = 1; timer->null_count = 1;
@ -1045,7 +1045,7 @@ void pit8253_device::gate_w(int gate, int state)
if (timer == nullptr) if (timer == nullptr)
return; return;
LOG2(("pit8253 : gate_w(): gate=%d state=%d\n", gate, state)); LOG2(("gate_w(): gate=%d state=%d\n", gate, state));
if (state != timer->gate) if (state != timer->gate)
{ {
@ -1084,7 +1084,7 @@ void pit8253_device::set_clockin(int timerno, double new_clockin)
pit8253_timer *timer = get_timer(timerno); pit8253_timer *timer = get_timer(timerno);
assert(timer != nullptr); assert(timer != nullptr);
LOG2(("pit8253_set_clockin(): PIT timer=%d, clockin = %f\n", timerno, new_clockin)); LOG2(("set_clockin(): PIT timer=%d, clockin = %f\n", timerno, new_clockin));
update(timer); update(timer);
timer->clockin = new_clockin; timer->clockin = new_clockin;
@ -1097,7 +1097,7 @@ void pit8253_device::set_clock_signal(int timerno, int state)
pit8253_timer *timer = get_timer(timerno); pit8253_timer *timer = get_timer(timerno);
assert(timer != nullptr); assert(timer != nullptr);
LOG2(("pit8253_set_clock_signal(): PIT timer=%d, state = %d\n", timerno, state)); LOG2(("set_clock_signal(): PIT timer=%d, state = %d\n", timerno, state));
/* Trigger on low to high transition */ /* Trigger on low to high transition */
if (!timer->clock && state) if (!timer->clock && state)

6
src/devices/video/mc6845.cpp
View File

@ -441,6 +441,12 @@ READ_LINE_MEMBER( mc6845_device::cursor_r )
} }
READ_LINE_MEMBER( mc6845_device::cursor_state_r )
{
return m_cursor_state;
}
READ_LINE_MEMBER( mc6845_device::hsync_r ) READ_LINE_MEMBER( mc6845_device::hsync_r )
{ {
return m_hsync; return m_hsync;

1
src/devices/video/mc6845.h
View File

@ -141,6 +141,7 @@ public:
// read cursor line state // read cursor line state
DECLARE_READ_LINE_MEMBER( cursor_r ); DECLARE_READ_LINE_MEMBER( cursor_r );
DECLARE_READ_LINE_MEMBER( cursor_state_r );
// read horizontal sync line state // read horizontal sync line state
DECLARE_READ_LINE_MEMBER( hsync_r ); DECLARE_READ_LINE_MEMBER( hsync_r );

128
src/mame/drivers/amusco.cpp
View File

@ -7,12 +7,6 @@
Preliminary driver by Roberto Fresca. Preliminary driver by Roberto Fresca.
TODO:
- i8259 and irqs
- understand how videoram works (tied to port $70?)
- inputs
- everything else;
******************************************************************************* *******************************************************************************
Hardware Notes: Hardware Notes:
@ -48,7 +42,8 @@
The program code reads from and writes to what must be a line printer and a RTC The program code reads from and writes to what must be a line printer and a RTC
(probably a MSM5832), though neither is present on the main board. The I/O write (probably a MSM5832), though neither is present on the main board. The I/O write
patterns also suggest that each or both of these devices are accessed through an patterns also suggest that each or both of these devices are accessed through an
unknown interface chip or gate array (not i8255-compatible). unknown interface chip or gate array (not i8255-compatible). The printer appears to
use non-Epson control codes: ETB, DLE, DC4, DC2, SO, EM, DC1 and STX.
***************************************************************************************** *****************************************************************************************
@ -67,8 +62,11 @@
TODO: TODO:
- Proper tile colors. - Proper tile colors.
- Hook PPI8255 devices. - Determine PIT clocks for proper IRQ timing.
- I/O. - Make the 6845 transparent videoram addressing actually transparent.
(IRQ1 changes the 6845 address twice but neither reads nor writes data?)
- Add NVRAM in a way that won't trigger POST error message (needs NMI on shutdown?)
- Identify outputs from first PPI (these include button lamps?)
*******************************************************************************/ *******************************************************************************/
@ -100,13 +98,17 @@ public:
m_gfxdecode(*this, "gfxdecode"), m_gfxdecode(*this, "gfxdecode"),
m_pic(*this, "pic8259"), m_pic(*this, "pic8259"),
m_rtc(*this, "rtc"), m_rtc(*this, "rtc"),
m_crtc(*this, "crtc") m_crtc(*this, "crtc"),
m_screen(*this, "screen")
{ } { }
required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_videoram;
tilemap_t *m_bg_tilemap; tilemap_t *m_bg_tilemap;
TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_bg_tile_info);
virtual void video_start() override; virtual void video_start() override;
DECLARE_READ8_MEMBER(hack_coin1_r);
DECLARE_READ8_MEMBER(hack_coin2_r);
DECLARE_READ8_MEMBER(hack_908_r);
DECLARE_READ8_MEMBER(mc6845_r); DECLARE_READ8_MEMBER(mc6845_r);
DECLARE_WRITE8_MEMBER(mc6845_w); DECLARE_WRITE8_MEMBER(mc6845_w);
DECLARE_WRITE8_MEMBER(output_a_w); DECLARE_WRITE8_MEMBER(output_a_w);
@ -118,13 +120,14 @@ public:
DECLARE_READ8_MEMBER(rtc_r); DECLARE_READ8_MEMBER(rtc_r);
DECLARE_WRITE8_MEMBER(rtc_w); DECLARE_WRITE8_MEMBER(rtc_w);
MC6845_ON_UPDATE_ADDR_CHANGED(crtc_addr); MC6845_ON_UPDATE_ADDR_CHANGED(crtc_addr);
MC6845_UPDATE_ROW(update_row);
UINT32 screen_update_amusco(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
required_device<cpu_device> m_maincpu; required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode; required_device<gfxdecode_device> m_gfxdecode;
required_device<pic8259_device> m_pic; required_device<pic8259_device> m_pic;
required_device<msm5832_device> m_rtc; required_device<msm5832_device> m_rtc;
required_device<mc6845_device> m_crtc; required_device<mc6845_device> m_crtc;
required_device<screen_device> m_screen;
UINT8 m_mc6845_address; UINT8 m_mc6845_address;
UINT16 m_video_update_address; UINT16 m_video_update_address;
}; };
@ -143,11 +146,16 @@ TILE_GET_INFO_MEMBER(amusco_state::get_bg_tile_info)
---- ---- seems unused. ---- ---- seems unused.
*/ */
int code = m_videoram[tile_index * 2] | (m_videoram[tile_index * 2 + 1] << 8); int code = m_videoram[tile_index * 2] | (m_videoram[tile_index * 2 + 1] << 8);
int color = (code & 0x7000) >> 12;
// 6845 cursor is only used for its blink state
if (BIT(code, 15) && !m_crtc->cursor_state_r())
code = 0;
SET_TILE_INFO_MEMBER( SET_TILE_INFO_MEMBER(
0 /* bank */, 0 /* bank */,
code & 0x3ff, code & 0x3ff,
0 /* color */, color,
0 0
); );
} }
@ -157,23 +165,37 @@ void amusco_state::video_start()
m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(amusco_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 10, 74, 24); m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(amusco_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 10, 74, 24);
} }
UINT32 amusco_state::screen_update_amusco(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
m_bg_tilemap->draw(screen, bitmap, cliprect, 0, 0);
return 0;
}
/************************** /**************************
* Read / Write Handlers * * Read / Write Handlers *
**************************/ **************************/
READ8_MEMBER(amusco_state::hack_coin1_r)
{
// actually set by IRQ4
return BIT(ioport("IN2")->read(), 1) ? 1 : 0;
}
READ8_MEMBER(amusco_state::hack_coin2_r)
{
// actually set by IRQ4
return BIT(ioport("IN2")->read(), 2) ? 1 : 0;
}
READ8_MEMBER(amusco_state::hack_908_r)
{
// IRQ4 and other routines wait for bits of this to be set by IRQ2
return 0xff;
}
/************************* /*************************
* Memory Map Information * * Memory Map Information *
*************************/ *************************/
static ADDRESS_MAP_START( amusco_mem_map, AS_PROGRAM, 8, amusco_state ) static ADDRESS_MAP_START( amusco_mem_map, AS_PROGRAM, 8, amusco_state )
AM_RANGE(0x006a6, 0x006a6) AM_READ(hack_coin1_r)
AM_RANGE(0x006a8, 0x006a8) AM_READ(hack_coin2_r)
AM_RANGE(0x00908, 0x00908) AM_READ(hack_908_r)
AM_RANGE(0x00000, 0x0ffff) AM_RAM AM_RANGE(0x00000, 0x0ffff) AM_RAM
AM_RANGE(0xec000, 0xecfff) AM_RAM AM_SHARE("videoram") // placeholder AM_RANGE(0xec000, 0xecfff) AM_RAM AM_SHARE("videoram") // placeholder
AM_RANGE(0xf8000, 0xfffff) AM_ROM AM_RANGE(0xf8000, 0xfffff) AM_ROM
@ -228,9 +250,20 @@ WRITE8_MEMBER(amusco_state::vram_w)
READ8_MEMBER(amusco_state::lpt_r) READ8_MEMBER(amusco_state::lpt_r)
{ {
switch (offset)
{
case 2:
// Bit 0 = busy
// Bit 1 = paper jam (inverted)
// Bit 3 = out of paper
// Bit 4 = low paper
return 2;
default:
logerror("Reading from printer port 28%dh\n", offset); logerror("Reading from printer port 28%dh\n", offset);
return 0; return 0;
} }
}
WRITE8_MEMBER(amusco_state::lpt_w) WRITE8_MEMBER(amusco_state::lpt_w)
{ {
@ -301,34 +334,29 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( amusco ) static INPUT_PORTS_START( amusco )
PORT_START("IN0") PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_1) PORT_NAME("IN0-1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_GAMBLE_BET ) PORT_NAME("Play Credit")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_2) PORT_NAME("IN0-2") PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 ) // actual name uncertain; next screen in service mode
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_3) PORT_NAME("IN0-3") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_GAMBLE_PAYOUT ) // decrement in service mode
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_GAMBLE_BOOK ) PORT_CODE(KEYCODE_4) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_GAMBLE_BOOK )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_5) PORT_NAME("IN0-5") PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_GAMBLE_DEAL ) PORT_NAME("Draw") // previous screen in service mode
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_6) PORT_NAME("IN0-6") PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_GAMBLE_STAND ) // actual name uncertain; increment in service mode
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_7) PORT_NAME("IN0-7") PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_POKER_HOLD1 ) // move left in service mode
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_8) PORT_NAME("IN0-8") PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_POKER_HOLD2 ) // move right in service mode
PORT_START("IN1") PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CODE(KEYCODE_Q) PORT_NAME("Cash Door") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CODE(KEYCODE_Q) PORT_NAME("Cash Door")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_GAMBLE_SERVICE ) PORT_CODE(KEYCODE_W) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_GAMBLE_SERVICE )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_E) PORT_NAME("IN1-3") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_R) PORT_NAME("IN1-4") PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CODE(KEYCODE_T) PORT_NAME("Logic Door") PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CODE(KEYCODE_T) PORT_NAME("Logic Door")
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_Y) PORT_NAME("IN1-6") PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_POKER_HOLD5 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_U) PORT_NAME("IN1-7") PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_POKER_HOLD4 ) // move down in service mode
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_I) PORT_NAME("IN1-8") PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_POKER_HOLD3 ) // move up in service mode
PORT_START("IN2") PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_A) PORT_NAME("IN2-1") PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN1 ) //PORT_WRITE_LINE_DEVICE_MEMBER("pic8259", pic8259_device, ir4_w)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_S) PORT_NAME("IN2-2") PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN2 ) //PORT_WRITE_LINE_DEVICE_MEMBER("pic8259", pic8259_device, ir4_w)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_D) PORT_NAME("IN2-3") PORT_BIT( 0xf9, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_F) PORT_NAME("IN2-4")
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_G) PORT_NAME("IN2-5")
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_H) PORT_NAME("IN2-6")
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_J) PORT_NAME("IN2-7")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_K) PORT_NAME("IN2-8")
INPUT_PORTS_END INPUT_PORTS_END
@ -353,7 +381,7 @@ static const gfx_layout charlayout =
******************************/ ******************************/
static GFXDECODE_START( amusco ) static GFXDECODE_START( amusco )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 8 ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, /*8*/ 1 ) // current palette has only 8 colors...
GFXDECODE_END GFXDECODE_END
@ -366,6 +394,13 @@ MC6845_ON_UPDATE_ADDR_CHANGED(amusco_state::crtc_addr)
// m_video_update_address = address; // m_video_update_address = address;
} }
MC6845_UPDATE_ROW(amusco_state::update_row)
{
const rectangle rowrect(0, 8 * x_count - 1, y, y);
m_bg_tilemap->mark_all_dirty();
m_bg_tilemap->draw(*m_screen, bitmap, rowrect, 0, 0);
}
/************************* /*************************
* Machine Drivers * * Machine Drivers *
*************************/ *************************/
@ -381,6 +416,10 @@ static MACHINE_CONFIG_START( amusco, amusco_state )
MCFG_PIC8259_ADD("pic8259", INPUTLINE("maincpu", 0), VCC, NOOP) MCFG_PIC8259_ADD("pic8259", INPUTLINE("maincpu", 0), VCC, NOOP)
MCFG_DEVICE_ADD("pit8253", PIT8253, 0) MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
//MCFG_PIT8253_CLK0(nnn)
//MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic8259", pic8259_device, ir0_w))
//MCFG_PIT8253_CLK1(nnn)
//MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("pic8259", pic8259_device, ir2_w))
MCFG_DEVICE_ADD("ppi_outputs", I8255, 0) MCFG_DEVICE_ADD("ppi_outputs", I8255, 0)
MCFG_I8255_OUT_PORTA_CB(WRITE8(amusco_state, output_a_w)) MCFG_I8255_OUT_PORTA_CB(WRITE8(amusco_state, output_a_w))
@ -400,10 +439,10 @@ static MACHINE_CONFIG_START( amusco, amusco_state )
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
MCFG_SCREEN_SIZE(88*8, 27*10) // screen size: 88*8 27*10 MCFG_SCREEN_SIZE(88*8, 27*10) // screen size: 88*8 27*10
MCFG_SCREEN_VISIBLE_AREA(0*8, 74*8-1, 0*10, 24*10-1) // visible scr: 74*8 24*10 MCFG_SCREEN_VISIBLE_AREA(0*8, 74*8-1, 0*10, 24*10-1) // visible scr: 74*8 24*10
MCFG_SCREEN_UPDATE_DRIVER(amusco_state, screen_update_amusco) MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update)
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", amusco) MCFG_GFXDECODE_ADD("gfxdecode", "palette", amusco)
MCFG_PALETTE_ADD_3BIT_GBR("palette") MCFG_PALETTE_ADD_3BIT_GBR("palette")
MCFG_MC6845_ADD("crtc", R6545_1, "screen", CRTC_CLOCK) /* guess */ MCFG_MC6845_ADD("crtc", R6545_1, "screen", CRTC_CLOCK) /* guess */
@ -412,6 +451,7 @@ static MACHINE_CONFIG_START( amusco, amusco_state )
MCFG_MC6845_ADDR_CHANGED_CB(amusco_state, crtc_addr) MCFG_MC6845_ADDR_CHANGED_CB(amusco_state, crtc_addr)
MCFG_MC6845_OUT_DE_CB(DEVWRITELINE("pic8259", pic8259_device, ir1_w)) // IRQ1 sets 0x918 bit 3 MCFG_MC6845_OUT_DE_CB(DEVWRITELINE("pic8259", pic8259_device, ir1_w)) // IRQ1 sets 0x918 bit 3
MCFG_MC6845_OUT_VSYNC_CB(DEVWRITELINE("pic8259", pic8259_device, ir0_w)) // IRQ0 sets 0x665 to 0xff MCFG_MC6845_OUT_VSYNC_CB(DEVWRITELINE("pic8259", pic8259_device, ir0_w)) // IRQ0 sets 0x665 to 0xff
MCFG_MC6845_UPDATE_ROW_CB(amusco_state, update_row)
/* sound hardware */ /* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SPEAKER_STANDARD_MONO("mono")
@ -449,4 +489,4 @@ ROM_END
*************************/ *************************/
/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS */ /* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS */
GAME( 1987, amusco, 0, amusco, amusco, driver_device, 0, ROT0, "Amusco", "American Music Poker (V1.4)", MACHINE_NOT_WORKING ) GAME( 1987, amusco, 0, amusco, amusco, driver_device, 0, ROT0, "Amusco", "American Music Poker (V1.4)", MACHINE_IMPERFECT_COLORS ) // runs much too fast; palette totally wrong