Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-22 16:31:49 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

machine/sis85c496.cpp: add preliminary IDE support

Browse Source
This commit is contained in:
angelosa 2023-06-29 03:53:53 +02:00
parent 1a063ba10c
commit b1d8f14fe6
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/devices/machine/sis85c496.cpp
View File

@ -32,6 +32,7 @@ void sis85c496_host_device::config_map(address_map &map)
m_dram_boundary[offset] = data;
})
);
map(0x58, 0x59).rw(FUNC(sis85c496_host_device::ide_vesa_config_r), FUNC(sis85c496_host_device::ide_vesa_config_w));
map(0x5a, 0x5a).rw(FUNC(sis85c496_host_device::smram_ctrl_r), FUNC(sis85c496_host_device::smram_ctrl_w));
map(0xc8, 0xcb).rw(FUNC(sis85c496_host_device::mailbox_r), FUNC(sis85c496_host_device::mailbox_w));
map(0xd0, 0xd0).rw(FUNC(sis85c496_host_device::bios_config_r), FUNC(sis85c496_host_device::bios_config_w));
@ -126,6 +127,12 @@ void sis85c496_host_device::device_add_mconfig(machine_config &config)
m_isabus->set_memspace(m_maincpu, AS_PROGRAM);
m_isabus->set_iospace(m_maincpu, AS_IO);
IDE_CONTROLLER_32(config, m_ide[0]).options(ata_devices, "hdd", nullptr, false);
m_ide[0]->irq_handler().set(m_pic8259_slave, FUNC(pic8259_device::ir6_w));
IDE_CONTROLLER_32(config, m_ide[1]).options(ata_devices, "cdrom", nullptr, false);
m_ide[1]->irq_handler().set(m_pic8259_slave, FUNC(pic8259_device::ir7_w));
/* sound hardware */
SPEAKER(config, "mono").front_center();
SPEAKER_SOUND(config, m_speaker).add_route(ALL_OUTPUTS, "mono", 0.50);
@ -145,6 +152,7 @@ sis85c496_host_device::sis85c496_host_device(const machine_config &mconfig, cons
m_ds12885(*this, "rtc"),
m_pc_kbdc(*this, "kbd"),
m_isabus(*this, "isabus"),
m_ide(*this, "ide%u", 1U),
m_at_spkrdata(0), m_pit_out2(0), m_dma_channel(0), m_cur_eop(false), m_dma_high_byte(0), m_at_speaker(0), m_refresh(false), m_channel_check(0), m_nmi_enabled(0)
{
}
@ -206,6 +214,7 @@ void sis85c496_host_device::device_reset()
m_isa_decoder = 0xff;
m_shadctrl = 0;
m_smramctrl = 0;
m_ide_vesa_ctrl = 0;
}
void sis85c496_host_device::device_config_complete()
@ -351,6 +360,22 @@ void sis85c496_host_device::map_extra(uint64_t memory_window_start, uint64_t mem
memory_space->install_ram(0x00000000, 0x0009ffff, &ram[0x00000000/4]);
}
if (BIT(m_ide_vesa_ctrl, 8))
{
const bool main_ch_select = bool(BIT(m_ide_vesa_ctrl, 9));
io_space->install_readwrite_handler(0x1f0, 0x1f7, read32s_delegate(*m_ide[main_ch_select], FUNC(ide_controller_32_device::cs0_r)), write32s_delegate(*m_ide[main_ch_select], FUNC(ide_controller_32_device::cs0_w)), 0xffffffff);
if (!BIT(m_ide_vesa_ctrl, 7))
io_space->install_readwrite_handler(0x3f0, 0x3f7, read32s_delegate(*m_ide[main_ch_select], FUNC(ide_controller_32_device::cs1_r)), write32s_delegate(*m_ide[main_ch_select], FUNC(ide_controller_32_device::cs1_w)));
const bool sub_ch_select = main_ch_select ^ 1;
io_space->install_readwrite_handler(0x170, 0x177, read32s_delegate(*m_ide[sub_ch_select], FUNC(ide_controller_32_device::cs0_r)), write32s_delegate(*m_ide[sub_ch_select], FUNC(ide_controller_32_device::cs0_w)), 0xffffffff);
if (!BIT(m_ide_vesa_ctrl, 6))
io_space->install_readwrite_handler(0x370, 0x377, read32s_delegate(*m_ide[sub_ch_select], FUNC(ide_controller_32_device::cs1_r)), write32s_delegate(*m_ide[sub_ch_select], FUNC(ide_controller_32_device::cs1_w)));
}
// 32 megs of RAM (todo: don't hardcode)
memory_space->install_ram(0x00100000, 0x01ffffff, &ram[0x00100000/4]);
}

7
src/devices/machine/sis85c496.h
View File

@ -6,8 +6,9 @@
#define SIS85C496_H
#include "pci.h"
#include "machine/ins8250.h"
#include "machine/ds128x.h"
#include "machine/idectrl.h"
#include "machine/ins8250.h"
#include "machine/pic8259.h"
#include "machine/pit8253.h"
@ -73,6 +74,7 @@ private:
required_device<ds12885_device> m_ds12885;
required_device<pc_kbdc_device> m_pc_kbdc;
required_device<isa16_device> m_isabus;
required_device_array<ide_controller_32_device, 2> m_ide;
uint8_t m_at_spkrdata;
uint8_t m_pit_out2;
@ -94,6 +96,7 @@ private:
uint8_t m_bios_config, m_dram_config, m_isa_decoder;
uint16_t m_shadctrl;
uint8_t m_smramctrl;
uint16_t m_ide_vesa_ctrl;
u8 m_dram_boundary[8]{};
void internal_io_map(address_map &map);
@ -110,6 +113,8 @@ private:
void shadow_config_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) { COMBINE_DATA(&m_shadctrl); logerror("SiS496: %04x to shadow control\n", m_shadctrl); remap_cb(); }
uint8_t smram_ctrl_r() { return m_smramctrl; }
void smram_ctrl_w(uint8_t data) { m_smramctrl = data; remap_cb(); }
uint16_t ide_vesa_config_r() { return m_ide_vesa_ctrl; }
void ide_vesa_config_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) { COMBINE_DATA(&m_ide_vesa_ctrl); logerror("SiS496: %04x to IDE/VESA Bus configuration\n", m_ide_vesa_ctrl); remap_cb(); }
// southbridge
uint8_t at_page8_r(offs_t offset);