trunk/src/mess/drivers/tmc2000e.c
| r20528 | r20529 | |
|---|
| 152 | 152 | |
| 153 | 153 | READ_LINE_MEMBER( tmc2000e_state::clear_r ) |
| 154 | 154 | { |
| 155 | | return BIT(ioport("RUN")->read(), 0); |
| 155 | return BIT(m_io_run->read(), 0); |
| 156 | 156 | } |
| 157 | 157 | |
| 158 | 158 | READ_LINE_MEMBER( tmc2000e_state::ef2_r ) |
| r20528 | r20529 | |
|---|
| 162 | 162 | |
| 163 | 163 | READ_LINE_MEMBER( tmc2000e_state::ef3_r ) |
| 164 | 164 | { |
| 165 | | static const char *const keynames[] = { "IN0", "IN1", "IN2", "IN3", "IN4", "IN5", "IN6", "IN7" }; |
| 166 | | UINT8 data = ~ioport(keynames[m_keylatch / 8])->read(); |
| 165 | ioport_port *keynames[] = { m_io_in0, m_io_in1, m_io_in2, m_io_in3, m_io_in4, m_io_in5, m_io_in6, m_io_in7 }; |
| 166 | UINT8 data = ~(keynames[m_keylatch / 8])->read(); |
| 167 | 167 | |
| 168 | 168 | return BIT(data, m_keylatch % 8); |
| 169 | 169 | } |
trunk/src/mess/includes/tmc2000e.h
| r20528 | r20529 | |
|---|
| 24 | 24 | { |
| 25 | 25 | public: |
| 26 | 26 | tmc2000e_state(const machine_config &mconfig, device_type type, const char *tag) |
| 27 | | : driver_device(mconfig, type, tag), |
| 28 | | m_maincpu(*this, CDP1802_TAG), |
| 29 | | m_cti(*this, CDP1864_TAG), |
| 30 | | m_cassette(*this, CASSETTE_TAG) |
| 31 | | , |
| 32 | | m_colorram(*this, "colorram"){ } |
| 27 | : driver_device(mconfig, type, tag) |
| 28 | , m_maincpu(*this, CDP1802_TAG) |
| 29 | , m_cti(*this, CDP1864_TAG) |
| 30 | , m_cassette(*this, CASSETTE_TAG) |
| 31 | , m_colorram(*this, "colorram") |
| 32 | , m_io_in0(*this, "IN0") |
| 33 | , m_io_in1(*this, "IN1") |
| 34 | , m_io_in2(*this, "IN2") |
| 35 | , m_io_in3(*this, "IN3") |
| 36 | , m_io_in4(*this, "IN4") |
| 37 | , m_io_in5(*this, "IN5") |
| 38 | , m_io_in6(*this, "IN6") |
| 39 | , m_io_in7(*this, "IN7") |
| 40 | , m_io_run(*this, "RUN") |
| 41 | { } |
| 33 | 42 | |
| 34 | 43 | required_device<cpu_device> m_maincpu; |
| 35 | 44 | required_device<cdp1864_device> m_cti; |
| r20528 | r20529 | |
|---|
| 66 | 75 | /* keyboard state */ |
| 67 | 76 | int m_keylatch; /* key latch */ |
| 68 | 77 | int m_reset; /* reset activated */ |
| 78 | |
| 79 | protected: |
| 80 | required_ioport m_io_in0; |
| 81 | required_ioport m_io_in1; |
| 82 | required_ioport m_io_in2; |
| 83 | required_ioport m_io_in3; |
| 84 | required_ioport m_io_in4; |
| 85 | required_ioport m_io_in5; |
| 86 | required_ioport m_io_in6; |
| 87 | required_ioport m_io_in7; |
| 88 | required_ioport m_io_run; |
| 69 | 89 | }; |
| 70 | 90 | |
| 71 | 91 | #endif |