revert part of timer.h change (nw)

This commit is contained in:
hap 2019-02-13 09:35:36 +01:00
parent d572847403
commit f6262a1e86
5 changed files with 11 additions and 7 deletions

View File

@ -466,6 +466,7 @@ void hmcs40_cpu_device::do_interrupt()
m_irt = 0;
standard_irq_callback(line);
m_prev_pc = m_pc;
}
void hmcs40_cpu_device::execute_set_input(int line, int state)

View File

@ -111,10 +111,9 @@ public:
// adjustments
void reset() { adjust(attotime::never, 0, attotime::never); }
void adjust(const attotime &duration, s32 param = 0, const attotime &period = attotime::never)
void adjust(const attotime &duration, s32 param = 0, const attotime &period = attotime::never) const
{
assert(m_type == TIMER_TYPE_GENERIC);
m_period = period;
m_timer->adjust(duration, param, period);
}
@ -123,7 +122,7 @@ public:
attotime time_left() const { return m_timer->remaining(); }
attotime start_time() const { return m_timer->start(); }
attotime fire_time() const { return m_timer->expire(); }
attotime period() const { return m_period; }
attotime period() const { return m_period; } // only for TIMER_TYPE_PERIODIC
private:
// device-level overrides

View File

@ -32,7 +32,7 @@ Memory map:
0800-0FFF: 1K of RAM (note: mirrored twice)
1000-17FF: PIA 0 (display, TSI speech chip)
1800-1FFF: PIA 1 (keypad, LEDs)
2000-3FFF: 101-64019 ROM (also used on the regular sensory chess challenger)
2000-3FFF: 101-64019 ROM*
4000-7FFF: mirror of 0000-3FFF
8000-9FFF: not used
A000-BFFF: 101-1025A03 ROM
@ -40,6 +40,10 @@ C000-DFFF: 101-1025A02 ROM
E000-FDFF: 101-1025A01 ROM
FE00-FFFF: 512 byte 74S474 PROM
*: 101-64019 is also used on the VSC(fidelz80.cpp). It contains the opening book
and "64 greatest games", as well as some Z80 code. Obviously the latter is unused
on the CSC.
CPU is a 6502 running at 1.95MHz (3.9MHz resonator, divided by 2)
NMI is not used.

View File

@ -1436,7 +1436,7 @@ static INPUT_PORTS_START( vbrc )
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_R) PORT_CHANGED_MEMBER(DEVICE_SELF, fidelz80_state, reset_button, nullptr) PORT_NAME("RE")
PORT_START("BARCODE")
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_CUSTOM) PORT_CODE(KEYCODE_F1) PORT_NAME("Card Scanner")
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_CODE(KEYCODE_F1) PORT_NAME("Card Scanner")
INPUT_PORTS_END
@ -1493,7 +1493,7 @@ static INPUT_PORTS_START( bv3 )
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_R) PORT_CHANGED_MEMBER(DEVICE_SELF, fidelz80_state, reset_button, nullptr) PORT_NAME("Reset")
PORT_START("BARCODE")
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_CUSTOM) PORT_CODE(KEYCODE_F1) PORT_NAME("Card Scanner")
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_CODE(KEYCODE_F1) PORT_NAME("Card Scanner")
INPUT_PORTS_END

View File

@ -1785,7 +1785,7 @@ static INPUT_PORTS_START( vidchal )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_CUSTOM ) // TODO: light sensor
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_CODE(KEYCODE_F1) PORT_NAME("Light Sensor")
INPUT_PORTS_END
void vidchal_state::vidchal(machine_config &config)