diff options
author | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 23:13:40 +0100 |
---|---|---|
committer | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 23:13:40 +0100 |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /src/devices/machine/tms9901.h | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/machine/tms9901.h')
-rw-r--r-- | src/devices/machine/tms9901.h | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/devices/machine/tms9901.h b/src/devices/machine/tms9901.h index eda01f253ad..86a2c6852e3 100644 --- a/src/devices/machine/tms9901.h +++ b/src/devices/machine/tms9901.h @@ -60,11 +60,8 @@ public: DECLARE_WRITE_LINE_MEMBER( rst1_line ); - // Synchronous clock input - DECLARE_WRITE_LINE_MEMBER( phi_line ); - - uint8_t read(offs_t offset); - void write(offs_t offset, uint8_t data); + DECLARE_READ8_MEMBER( read ); + DECLARE_WRITE8_MEMBER( write ); auto p_out_cb(int n) { return m_write_p[n].bind(); } auto read_cb() { return m_read_block.bind(); } @@ -86,9 +83,6 @@ private: // Common method for device_reset and rst1_line void do_reset(); - // Common clock handling - void clock_in(line_state clk); - // State of the INT1-INT15 lines (must be inverted when queried) // Note that the levels must also be delivered when reading the pins, which // may require to latch the int levels. @@ -99,9 +93,6 @@ private: bool m_int_pending; // status of the int* pin (connected to TMS9900) bool m_timer_int_pending; // timer int pending (overrides int3 pin if timer enabled) - bool m_clock_active; - int m_clockdiv; // Clock divider counter (for synchronous clock) - // PIO registers int m_pio_direction; // direction register for PIO @@ -119,7 +110,7 @@ private: // true = clock mode (read/write clock interval) bool m_clock_mode; - // Timer, used to emulate the decrementer register + // MESS timer, used to emulate the decrementer register emu_timer *m_decrementer; // clock interval, loaded in decrementer when it reaches 0. |