diff options
author | 2019-03-26 11:13:37 +1100 | |
---|---|---|
committer | 2019-03-26 11:13:37 +1100 | |
commit | 97b67170277437131adf6ed4d60139c172529e4f (patch) | |
tree | 7a5cbf608f191075f1612b1af15832c206a3fe2d /src/devices/machine/aic6250.h | |
parent | b380514764cf857469bae61c11143a19f79a74c5 (diff) |
(nw) Clean up the mess on master
This effectively reverts b380514764cf857469bae61c11143a19f79a74c5 and
c24473ddff715ecec2e258a6eb38960cf8c8e98e, restoring the state at
598cd5227223c3b04ca31f0dbc1981256d9ea3ff.
Before pushing, please check that what you're about to push is sane.
Check your local commit log and ensure there isn't anything out-of-place
before pushing to mainline. When things like this happen, it wastes
everyone's time. I really don't need this in a week when real work⢠is
busting my balls and I'm behind where I want to be with preparing for
MAME release.
Diffstat (limited to 'src/devices/machine/aic6250.h')
-rw-r--r-- | src/devices/machine/aic6250.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/devices/machine/aic6250.h b/src/devices/machine/aic6250.h index 029c7f72dca..2a4ba02d118 100644 --- a/src/devices/machine/aic6250.h +++ b/src/devices/machine/aic6250.h @@ -34,6 +34,8 @@ public: void dma16_w(u16 data); protected: + aic6250_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + // standard device_interface overrides virtual void device_start() override; virtual void device_reset() override; @@ -52,11 +54,11 @@ protected: u8 status_reg_1_r(); u8 scsi_signal_reg_r(); u8 scsi_id_data_r(); - u8 source_dest_id_r() { logerror("source_dest_id_r\n"); return m_source_dest_id; } + u8 source_dest_id_r() { return m_source_dest_id; } u8 memory_data_r(); u8 port_a_r(); u8 port_b_r(); - u8 scsi_latch_data_r() { logerror("scsi_latch_data_r 0x%02x\n", m_scsi_latch_data); return m_scsi_latch_data; } + u8 scsi_latch_data_r() { return m_scsi_latch_data; } void dma_count_l_w(u8 data) { m_dma_count &= ~0x0000ff; m_dma_count |= (data << 0); } void dma_count_m_w(u8 data) { m_dma_count &= ~0x00ff00; m_dma_count |= (data << 8); } @@ -277,6 +279,13 @@ private: util::fifo <u8, 8> m_fifo; }; +class aic6251a_device : public aic6250_device +{ +public: + aic6251a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); +}; + DECLARE_DEVICE_TYPE(AIC6250, aic6250_device) +DECLARE_DEVICE_TYPE(AIC6251A, aic6251a_device) #endif // MAME_MACHINE_AIC6250_H |