Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-26 18:23:08 +03:00
Code Issues Actions 29 Packages Projects Releases Wiki Activity

lpc: skeleton acpi [O. Galibert]

Browse Source
This commit is contained in:
Olivier Galibert 2014-11-20 22:31:30 +01:00
parent f1f6d4c91c
commit 885bfef453
8 changed files with 485 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/emu/machine/i6300esb.c
View File

@ -83,7 +83,8 @@ ADDRESS_MAP_END
i6300esb_lpc_device::i6300esb_lpc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: pci_device(mconfig, I6300ESB_LPC, "i6300ESB southbridge ISA/LPC bridge", tag, owner, clock, "i6300esb_lpc", __FILE__)
: pci_device(mconfig, I6300ESB_LPC, "i6300ESB southbridge ISA/LPC bridge", tag, owner, clock, "i6300esb_lpc", __FILE__),
acpi(*this, "acpi")
{
}
@ -569,7 +570,8 @@ READ32_MEMBER (i6300esb_lpc_device::etr1_r)
WRITE32_MEMBER(i6300esb_lpc_device::etr1_w)
{
logerror("%s: etr1 = %08x\n", tag(), data);
COMBINE_DATA(&etr1);
logerror("%s: etr1 = %08x\n", tag(), etr1);
}
READ32_MEMBER (i6300esb_lpc_device::mfid_r)
@ -684,7 +686,7 @@ void i6300esb_lpc_device::map_extra(UINT64 memory_window_start, UINT64 memory_wi
io_space->install_device(0, 0xffff, *this, &i6300esb_lpc_device::internal_io_map);
if(acpi_cntl & 0x10)
logerror("%s: Warning: acpi range enabled at %04x-%04x\n", tag(), pmbase, pmbase+127);
acpi->map_device(memory_window_start, memory_window_end, 0, memory_space, io_window_start, io_window_end, pmbase, io_space);
if(gpio_cntl & 0x10)
logerror("%s: Warning: gpio range enabled at %04x-%04x\n", tag(), gpio_base, gpio_base+63);

3
src/emu/machine/i6300esb.h
View File

@ -4,6 +4,7 @@
#define I6300ESB_H
#include "pci.h"
#include "lpc-acpi.h"
#define MCFG_I6300ESB_LPC_ADD(_tag) \
MCFG_PCI_DEVICE_ADD(_tag, I6300ESB_LPC, 0x808625a1, 0x02, 0x060100, 0x00000000)
@ -27,6 +28,8 @@ protected:
virtual void device_reset();
private:
required_device<lpc_acpi_device> acpi;
DECLARE_ADDRESS_MAP(internal_io_map, 32);
UINT32 pmbase, gpio_base, fwh_sel1, gen_cntl, etr1, rst_cnt2, gpi_rout;

366
src/emu/machine/lpc-acpi.c Normal file
View File

@ -0,0 +1,366 @@
#include "lpc-acpi.h"
const device_type LPC_ACPI = &device_creator<lpc_acpi_device>;
DEVICE_ADDRESS_MAP_START(map, 32, lpc_acpi_device)
AM_RANGE(0x00, 0x03) AM_READWRITE16(pm1_sts_r, pm1_sts_w, 0x0000ffff)
AM_RANGE(0x00, 0x03) AM_READWRITE16(pm1_en_r, pm1_en_w, 0xffff0000)
AM_RANGE(0x04, 0x07) AM_READWRITE (pm1_cnt_r, pm1_cnt_w)
AM_RANGE(0x08, 0x0b) AM_READ (pm1_tmr_r)
AM_RANGE(0x10, 0x13) AM_READWRITE (proc_cnt_r, proc_cnt_w)
AM_RANGE(0x14, 0x17) AM_READ8 (lv2_r, 0x000000ff)
AM_RANGE(0x28, 0x2b) AM_READWRITE (gpe0_sts_r, gpe0_sts_w)
AM_RANGE(0x2c, 0x2f) AM_READWRITE (gpe0_en_r, gpe0_en_w)
AM_RANGE(0x30, 0x33) AM_READWRITE (smi_en_r, smi_en_w)
AM_RANGE(0x34, 0x37) AM_READWRITE (smi_sts_r, smi_sts_w)
AM_RANGE(0x38, 0x3b) AM_READWRITE16(alt_gp_smi_en_r, alt_gp_smi_en_w, 0x0000ffff)
AM_RANGE(0x38, 0x3b) AM_READWRITE16(alt_gp_smi_sts_r, alt_gp_smi_sts_w, 0xffff0000)
AM_RANGE(0x44, 0x47) AM_READWRITE16(devact_sts_r, devact_sts_w, 0x0000ffff)
AM_RANGE(0x48, 0x4b) AM_READWRITE16(devtrap_en_r, devtrap_en_w, 0x0000ffff)
AM_RANGE(0x4c, 0x4f) AM_READ16 (bus_addr_track_r, 0x0000ffff)
AM_RANGE(0x4c, 0x4f) AM_READ8 (bus_cyc_track_r, 0x00ff0000)
AM_RANGE(0x60, 0x63) AM_READWRITE8 (tco_rld_r, tco_rld_w, 0x000000ff)
AM_RANGE(0x60, 0x63) AM_READWRITE8 (tco_tmr_r, tco_tmr_w, 0x0000ff00)
AM_RANGE(0x60, 0x63) AM_READWRITE8 (tco_dat_in_r, tco_dat_in_w, 0x00ff0000)
AM_RANGE(0x60, 0x63) AM_READWRITE8 (tco_dat_out_r, tco_dat_out_w, 0xff000000)
AM_RANGE(0x64, 0x67) AM_READWRITE16(tco1_sts_r, tco1_sts_w, 0x0000ffff)
AM_RANGE(0x64, 0x67) AM_READWRITE16(tco2_sts_r, tco2_sts_w, 0xffff0000)
AM_RANGE(0x68, 0x6b) AM_READWRITE16(tco1_cnt_r, tco1_cnt_w, 0x0000ffff)
AM_RANGE(0x68, 0x6b) AM_READWRITE16(tco2_cnt_r, tco2_cnt_w, 0xffff0000)
AM_RANGE(0x6c, 0x6f) AM_READWRITE8 (tco_message1_r, tco_message1_w, 0x000000ff)
AM_RANGE(0x6c, 0x6f) AM_READWRITE8 (tco_message2_r, tco_message2_w, 0x0000ff00)
AM_RANGE(0x6c, 0x6f) AM_READWRITE8 (tco_wdstatus_r, tco_wdstatus_w, 0x00ff0000)
AM_RANGE(0x70, 0x73) AM_READWRITE8 (sw_irq_gen_r, sw_irq_gen_w, 0x000000ff)
ADDRESS_MAP_END
lpc_acpi_device::lpc_acpi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: lpc_device(mconfig, LPC_ACPI, "LPC ACPI", tag, owner, clock, "lpc_acpi", __FILE__)
{
}
void lpc_acpi_device::map_device(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space,
UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space)
{
io_space->install_device(io_offset, io_window_end, *this, &lpc_acpi_device::map);
}
void lpc_acpi_device::device_start()
{
}
void lpc_acpi_device::device_reset()
{
pm1_sts = 0;
pm1_en = 0;
pm1_cnt = 0;
proc_cnt = 0;
gpe0_sts = 0;
gpe0_en = 0;
smi_en = 0;
smi_sts = 0;
alt_gp_smi_en = 0;
alt_gp_smi_sts = 0;
devact_sts = 0;
devtrap_en = 0;
tco_rld = 0;
tco_tmr = 0;
tco_dat_in = 0;
tco_dat_out = 0;
tco1_sts = 0;
tco2_sts = 0;
tco1_cnt = 0;
tco2_cnt = 0;
tco_message1 = 0;
tco_message2 = 0;
tco_wdstatus = 0;
sw_irq_gen = 0;
}
READ16_MEMBER( lpc_acpi_device::pm1_sts_r)
{
return pm1_sts;
}
WRITE16_MEMBER(lpc_acpi_device::pm1_sts_w)
{
pm1_sts &= ~data;
logerror("%s: pm1_sts = %04x\n", tag(), pm1_sts);
}
READ16_MEMBER( lpc_acpi_device::pm1_en_r)
{
return pm1_en;
}
WRITE16_MEMBER(lpc_acpi_device::pm1_en_w)
{
COMBINE_DATA(&pm1_en);
logerror("%s: pm1_en = %04x\n", tag(), pm1_en);
}
READ32_MEMBER( lpc_acpi_device::pm1_cnt_r)
{
return pm1_cnt;
}
WRITE32_MEMBER(lpc_acpi_device::pm1_cnt_w)
{
COMBINE_DATA(&pm1_cnt);
logerror("%s: pm1_cnt = %08x\n", tag(), pm1_cnt);
}
READ32_MEMBER(lpc_acpi_device::pm1_tmr_r)
{
return machine().time().as_ticks(3579545) & 0xffffff;
}
READ32_MEMBER( lpc_acpi_device::proc_cnt_r)
{
return proc_cnt;
}
WRITE32_MEMBER(lpc_acpi_device::proc_cnt_w)
{
COMBINE_DATA(&proc_cnt);
logerror("%s: proc_cnt = %08x\n", tag(), proc_cnt);
}
READ8_MEMBER( lpc_acpi_device::lv2_r)
{
return 0x00;
}
READ32_MEMBER( lpc_acpi_device::gpe0_sts_r)
{
return gpe0_sts;
}
WRITE32_MEMBER(lpc_acpi_device::gpe0_sts_w)
{
COMBINE_DATA(&gpe0_sts);
logerror("%s: gpe0_sts = %08x\n", tag(), gpe0_sts);
}
READ32_MEMBER( lpc_acpi_device::gpe0_en_r)
{
return gpe0_en;
}
WRITE32_MEMBER(lpc_acpi_device::gpe0_en_w)
{
COMBINE_DATA(&gpe0_en);
logerror("%s: gpe0_en = %08x\n", tag(), gpe0_en);
}
READ32_MEMBER( lpc_acpi_device::smi_en_r)
{
return smi_en;
}
WRITE32_MEMBER(lpc_acpi_device::smi_en_w)
{
COMBINE_DATA(&smi_en);
logerror("%s: smi_en = %08x\n", tag(), smi_en);
}
READ32_MEMBER( lpc_acpi_device::smi_sts_r)
{
return smi_sts;
}
WRITE32_MEMBER(lpc_acpi_device::smi_sts_w)
{
COMBINE_DATA(&smi_sts);
logerror("%s: smi_sts = %08x\n", tag(), smi_sts);
}
READ16_MEMBER( lpc_acpi_device::alt_gp_smi_en_r)
{
return alt_gp_smi_en;
}
WRITE16_MEMBER(lpc_acpi_device::alt_gp_smi_en_w)
{
COMBINE_DATA(&alt_gp_smi_en);
logerror("%s: alt_gp_smi_en = %04x\n", tag(), alt_gp_smi_en);
}
READ16_MEMBER( lpc_acpi_device::alt_gp_smi_sts_r)
{
return alt_gp_smi_sts;
}
WRITE16_MEMBER(lpc_acpi_device::alt_gp_smi_sts_w)
{
COMBINE_DATA(&alt_gp_smi_sts);
logerror("%s: alt_gp_smi_sts = %04x\n", tag(), alt_gp_smi_sts);
}
READ16_MEMBER( lpc_acpi_device::devact_sts_r)
{
return devact_sts;
}
WRITE16_MEMBER(lpc_acpi_device::devact_sts_w)
{
COMBINE_DATA(&devact_sts);
logerror("%s: devact_sts = %04x\n", tag(), devact_sts);
}
READ16_MEMBER( lpc_acpi_device::devtrap_en_r)
{
return devtrap_en;
}
WRITE16_MEMBER(lpc_acpi_device::devtrap_en_w)
{
COMBINE_DATA(&devtrap_en);
logerror("%s: devtrap_en = %04x\n", tag(), devtrap_en);
}
READ16_MEMBER( lpc_acpi_device::bus_addr_track_r)
{
logerror("%s: read bus_addr_track\n", tag());
return 0;
}
READ8_MEMBER( lpc_acpi_device::bus_cyc_track_r)
{
logerror("%s: read bus_cyc_track\n", tag());
return 0;
}
READ8_MEMBER( lpc_acpi_device::tco_rld_r)
{
return tco_rld;
}
WRITE8_MEMBER( lpc_acpi_device::tco_rld_w)
{
tco_rld = data;
logerror("%s: tco_rld = %02x\n", tag(), tco_rld);
}
READ8_MEMBER( lpc_acpi_device::tco_tmr_r)
{
return tco_tmr;
}
WRITE8_MEMBER( lpc_acpi_device::tco_tmr_w)
{
tco_tmr = data;
logerror("%s: tco_tmr = %02x\n", tag(), tco_tmr);
}
READ8_MEMBER( lpc_acpi_device::tco_dat_in_r)
{
return tco_dat_in;
}
WRITE8_MEMBER( lpc_acpi_device::tco_dat_in_w)
{
tco_dat_in = data;
logerror("%s: tco_dat_in = %02x\n", tag(), tco_dat_in);
}
READ8_MEMBER( lpc_acpi_device::tco_dat_out_r)
{
return tco_dat_out;
}
WRITE8_MEMBER( lpc_acpi_device::tco_dat_out_w)
{
tco_dat_out = data;
logerror("%s: tco_dat_out = %02x\n", tag(), tco_dat_out);
}
READ16_MEMBER( lpc_acpi_device::tco1_sts_r)
{
return tco1_sts;
}
WRITE16_MEMBER(lpc_acpi_device::tco1_sts_w)
{
COMBINE_DATA(&tco1_sts);
logerror("%s: tco1_sts = %04x\n", tag(), tco1_sts);
}
READ16_MEMBER( lpc_acpi_device::tco2_sts_r)
{
return tco2_sts;
}
WRITE16_MEMBER(lpc_acpi_device::tco2_sts_w)
{
COMBINE_DATA(&tco2_sts);
logerror("%s: tco2_sts = %04x\n", tag(), tco2_sts);
}
READ16_MEMBER( lpc_acpi_device::tco1_cnt_r)
{
return tco1_cnt;
}
WRITE16_MEMBER(lpc_acpi_device::tco1_cnt_w)
{
COMBINE_DATA(&tco1_cnt);
logerror("%s: tco1_cnt = %04x\n", tag(), tco1_cnt);
}
READ16_MEMBER( lpc_acpi_device::tco2_cnt_r)
{
return tco2_cnt;
}
WRITE16_MEMBER(lpc_acpi_device::tco2_cnt_w)
{
COMBINE_DATA(&tco2_cnt);
logerror("%s: tco2_cnt = %04x\n", tag(), tco2_cnt);
}
READ8_MEMBER( lpc_acpi_device::tco_message1_r)
{
return tco_message1;
}
WRITE8_MEMBER( lpc_acpi_device::tco_message1_w)
{
tco_message1 = data;
logerror("%s: tco_message1 = %02x\n", tag(), tco_message1);
}
READ8_MEMBER( lpc_acpi_device::tco_message2_r)
{
return tco_message2;
}
WRITE8_MEMBER( lpc_acpi_device::tco_message2_w)
{
tco_message2 = data;
logerror("%s: tco_message2 = %02x\n", tag(), tco_message2);
}
READ8_MEMBER( lpc_acpi_device::tco_wdstatus_r)
{
return tco_wdstatus;
}
WRITE8_MEMBER( lpc_acpi_device::tco_wdstatus_w)
{
tco_wdstatus = data;
logerror("%s: tco_wdstatus = %02x\n", tag(), tco_wdstatus);
}
READ8_MEMBER( lpc_acpi_device::sw_irq_gen_r)
{
return sw_irq_gen;
}
WRITE8_MEMBER( lpc_acpi_device::sw_irq_gen_w)
{
sw_irq_gen = data;
logerror("%s: sw_irq_gen = %02x\n", tag(), sw_irq_gen);
}

86
src/emu/machine/lpc-acpi.h Normal file
View File

@ -0,0 +1,86 @@
#ifndef LPC_ACPI_H
#define LPC_ACPI_H
#include "lpc.h"
#define MCFG_LPC_ACPI_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, LPC_ACPI, 0)
class lpc_acpi_device : public lpc_device {
public:
lpc_acpi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual void map_device(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space,
UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space);
DECLARE_READ16_MEMBER( pm1_sts_r);
DECLARE_WRITE16_MEMBER(pm1_sts_w);
DECLARE_READ16_MEMBER( pm1_en_r);
DECLARE_WRITE16_MEMBER(pm1_en_w);
DECLARE_READ32_MEMBER( pm1_cnt_r);
DECLARE_WRITE32_MEMBER(pm1_cnt_w);
DECLARE_READ32_MEMBER( pm1_tmr_r);
DECLARE_READ32_MEMBER( proc_cnt_r);
DECLARE_WRITE32_MEMBER(proc_cnt_w);
DECLARE_READ8_MEMBER( lv2_r);
DECLARE_READ32_MEMBER( gpe0_sts_r);
DECLARE_WRITE32_MEMBER(gpe0_sts_w);
DECLARE_READ32_MEMBER( gpe0_en_r);
DECLARE_WRITE32_MEMBER(gpe0_en_w);
DECLARE_READ32_MEMBER( smi_en_r);
DECLARE_WRITE32_MEMBER(smi_en_w);
DECLARE_READ32_MEMBER( smi_sts_r);
DECLARE_WRITE32_MEMBER(smi_sts_w);
DECLARE_READ16_MEMBER( alt_gp_smi_en_r);
DECLARE_WRITE16_MEMBER(alt_gp_smi_en_w);
DECLARE_READ16_MEMBER( alt_gp_smi_sts_r);
DECLARE_WRITE16_MEMBER(alt_gp_smi_sts_w);
DECLARE_READ16_MEMBER( devact_sts_r);
DECLARE_WRITE16_MEMBER(devact_sts_w);
DECLARE_READ16_MEMBER( devtrap_en_r);
DECLARE_WRITE16_MEMBER(devtrap_en_w);
DECLARE_READ16_MEMBER( bus_addr_track_r);
DECLARE_READ8_MEMBER( bus_cyc_track_r);
DECLARE_READ8_MEMBER( tco_rld_r);
DECLARE_WRITE8_MEMBER( tco_rld_w);
DECLARE_READ8_MEMBER( tco_tmr_r);
DECLARE_WRITE8_MEMBER( tco_tmr_w);
DECLARE_READ8_MEMBER( tco_dat_in_r);
DECLARE_WRITE8_MEMBER( tco_dat_in_w);
DECLARE_READ8_MEMBER( tco_dat_out_r);
DECLARE_WRITE8_MEMBER( tco_dat_out_w);
DECLARE_READ16_MEMBER( tco1_sts_r);
DECLARE_WRITE16_MEMBER(tco1_sts_w);
DECLARE_READ16_MEMBER( tco2_sts_r);
DECLARE_WRITE16_MEMBER(tco2_sts_w);
DECLARE_READ16_MEMBER( tco1_cnt_r);
DECLARE_WRITE16_MEMBER(tco1_cnt_w);
DECLARE_READ16_MEMBER( tco2_cnt_r);
DECLARE_WRITE16_MEMBER(tco2_cnt_w);
DECLARE_READ8_MEMBER( tco_message1_r);
DECLARE_WRITE8_MEMBER( tco_message1_w);
DECLARE_READ8_MEMBER( tco_message2_r);
DECLARE_WRITE8_MEMBER( tco_message2_w);
DECLARE_READ8_MEMBER( tco_wdstatus_r);
DECLARE_WRITE8_MEMBER( tco_wdstatus_w);
DECLARE_READ8_MEMBER( sw_irq_gen_r);
DECLARE_WRITE8_MEMBER( sw_irq_gen_w);
protected:
void device_start();
void device_reset();
private:
UINT32 pm1_cnt, proc_cnt, gpe0_sts, gpe0_en, smi_en, smi_sts;
UINT16 pm1_sts, pm1_en, alt_gp_smi_en, alt_gp_smi_sts, devact_sts, devtrap_en;
UINT16 tco1_sts, tco2_sts, tco1_cnt, tco2_cnt;
UINT8 tco_rld, tco_tmr, tco_dat_in, tco_dat_out, tco_message1, tco_message2;
UINT8 tco_wdstatus, sw_irq_gen;
DECLARE_ADDRESS_MAP(map, 32);
};
extern const device_type LPC_ACPI;
#endif

7
src/emu/machine/lpc.c Normal file
View File

@ -0,0 +1,7 @@
#include "lpc.h"
lpc_device::lpc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source)
{
}

15
src/emu/machine/lpc.h Normal file
View File

@ -0,0 +1,15 @@
#ifndef LPC_H
#define LPC_H
#include "emu.h"
class lpc_device : public device_t {
public:
lpc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual void map_device(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space,
UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space) = 0;
};
#endif

2
src/emu/machine/machine.mak
View File

@ -1260,6 +1260,8 @@ MACHINEOBJS += $(MACHINEOBJ)/pci-smbus.o
MACHINEOBJS += $(MACHINEOBJ)/i82541.o
MACHINEOBJS += $(MACHINEOBJ)/i82875p.o
MACHINEOBJS += $(MACHINEOBJ)/i6300esb.o
MACHINEOBJS += $(MACHINEOBJ)/lpc.o
MACHINEOBJS += $(MACHINEOBJ)/lpc-acpi.o
endif
#-------------------------------------------------

1
src/mame/drivers/lindbergh.c
View File

@ -301,6 +301,7 @@ static MACHINE_CONFIG_START(lindbergh, lindbergh_state)
MCFG_SB0400_ADD( ":pci:1e.0:02.0", 0x11021101)
MCFG_SEGA_LINDBERGH_BASEBOARD_ADD(":pci:1e.0:03.0")
MCFG_I6300ESB_LPC_ADD( ":pci:1f.0")
MCFG_LPC_ACPI_ADD( ":pci:1f.0:acpi")
MCFG_SATA_ADD( ":pci:1f.2", 0x808625a3, 0x02, 0x103382c0)
MCFG_SMBUS_ADD( ":pci:1f.3", 0x808625a4, 0x02, 0x103382c0)
MCFG_AC97_ADD( ":pci:1f.5", 0x808625a6, 0x02, 0x103382c0)