Sprinter/mame
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(MESS) modernized psion.c nvram. nw.

Browse Source
This commit is contained in:
Fabio Priuli 2014-04-04 06:53:33 +00:00
parent 1f5e7ab5e8
commit eb6d490c99
2 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/mess/drivers/psion.c
View File

@ -23,7 +23,6 @@
#include "emu.h" #include "emu.h"
#include "includes/psion.h" #include "includes/psion.h"
#include "rendlay.h" #include "rendlay.h"
#include "mcfglgcy.h"
TIMER_DEVICE_CALLBACK_MEMBER(psion_state::nmi_timer) TIMER_DEVICE_CALLBACK_MEMBER(psion_state::nmi_timer)
{ {
@ -332,35 +331,14 @@ INPUT_PORTS_START( psion )
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("D [)]") PORT_CODE(KEYCODE_D) PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("D [)]") PORT_CODE(KEYCODE_D)
INPUT_PORTS_END INPUT_PORTS_END
static NVRAM_HANDLER( psion )
void psion_state::nvram_init(nvram_device &nvram, void *data, size_t size)
{ {
psion_state *state = machine.driver_data<psion_state>(); //cold start (by default is 1=warm start)
m_stby_pwr = 0;
if (read_or_write)
{
file->write(state->m_sys_register, 0xc0);
file->write(state->m_ram, state->m_ram.bytes());
if (state->m_ram_bank_count)
file->write(state->m_paged_ram, state->m_ram_bank_count * 0x4000);
}
else
{
if (file)
{
file->read(state->m_sys_register, 0xc0);
file->read(state->m_ram, state->m_ram.bytes());
if (state->m_ram_bank_count)
file->read(state->m_paged_ram, state->m_ram_bank_count * 0x4000);
//warm start
state->m_stby_pwr = 1;
}
else
//cold start
state->m_stby_pwr = 0;
}
} }
void psion_state::machine_start() void psion_state::machine_start()
{ {
if (!strcmp(machine().system().name, "psionlam")) if (!strcmp(machine().system().name, "psionlam"))
@ -406,6 +384,11 @@ void psion_state::machine_start()
membank("rambank")->set_entry(0); membank("rambank")->set_entry(0);
} }
m_nvram1->set_base(m_sys_register, 0xc0);
m_nvram2->set_base(m_ram, m_ram.bytes());
if (m_nvram3)
m_nvram3->set_base(m_paged_ram, m_ram_bank_count * 0x4000);
save_item(NAME(m_kb_counter)); save_item(NAME(m_kb_counter));
save_item(NAME(m_enable_nmi)); save_item(NAME(m_enable_nmi));
save_item(NAME(m_tcsr_value)); save_item(NAME(m_tcsr_value));
@ -498,7 +481,8 @@ static MACHINE_CONFIG_START( psion_2lines, psion_state )
MCFG_SOUND_ADD( "beeper", BEEP, 0 ) MCFG_SOUND_ADD( "beeper", BEEP, 0 )
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 ) MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
MCFG_NVRAM_HANDLER(psion) MCFG_NVRAM_ADD_CUSTOM_DRIVER("nvram1", psion_state, nvram_init) // sys_regs
MCFG_NVRAM_ADD_CUSTOM_DRIVER("nvram2", psion_state, nvram_init) // RAM
MCFG_TIMER_DRIVER_ADD_PERIODIC("nmi_timer", psion_state, nmi_timer, attotime::from_seconds(1)) MCFG_TIMER_DRIVER_ADD_PERIODIC("nmi_timer", psion_state, nmi_timer, attotime::from_seconds(1))
@ -544,12 +528,16 @@ static MACHINE_CONFIG_DERIVED( psionp350, psion_2lines )
MCFG_CPU_MODIFY("maincpu") MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(psionp350_mem) MCFG_CPU_PROGRAM_MAP(psionp350_mem)
MCFG_NVRAM_ADD_CUSTOM_DRIVER("nvram3", psion_state, nvram_init) // paged RAM
MACHINE_CONFIG_END MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( psionlz, psion_4lines ) static MACHINE_CONFIG_DERIVED( psionlz, psion_4lines )
MCFG_CPU_MODIFY("maincpu") MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(psionlz_mem) MCFG_CPU_PROGRAM_MAP(psionlz_mem)
MCFG_NVRAM_ADD_CUSTOM_DRIVER("nvram3", psion_state, nvram_init) // paged RAM
MACHINE_CONFIG_END MACHINE_CONFIG_END
/* ROM definition */ /* ROM definition */

9
src/mess/includes/psion.h
View File

@ -12,6 +12,7 @@
#define _PSION_H_ #define _PSION_H_
#include "cpu/m6800/m6800.h" #include "cpu/m6800/m6800.h"
#include "machine/nvram.h"
#include "machine/psion_pack.h" #include "machine/psion_pack.h"
#include "video/hd44780.h" #include "video/hd44780.h"
#include "sound/beep.h" #include "sound/beep.h"
@ -29,7 +30,11 @@ public:
m_beep(*this, "beeper"), m_beep(*this, "beeper"),
m_pack1(*this, "pack1"), m_pack1(*this, "pack1"),
m_pack2(*this, "pack2"), m_pack2(*this, "pack2"),
m_nvram1(*this, "nvram1"),
m_nvram2(*this, "nvram2"),
m_nvram3(*this, "nvram3"),
m_sys_register(*this, "sys_register"), m_sys_register(*this, "sys_register"),
m_stby_pwr(1),
m_ram(*this, "ram"){ } m_ram(*this, "ram"){ }
required_device<hd63701_cpu_device> m_maincpu; required_device<hd63701_cpu_device> m_maincpu;
@ -37,6 +42,9 @@ public:
required_device<beep_device> m_beep; required_device<beep_device> m_beep;
required_device<datapack_device> m_pack1; required_device<datapack_device> m_pack1;
required_device<datapack_device> m_pack2; required_device<datapack_device> m_pack2;
required_device<nvram_device> m_nvram1;
required_device<nvram_device> m_nvram2;
optional_device<nvram_device> m_nvram3;
UINT16 m_kb_counter; UINT16 m_kb_counter;
UINT8 m_enable_nmi; UINT8 m_enable_nmi;
@ -60,6 +68,7 @@ public:
virtual void machine_start(); virtual void machine_start();
virtual void machine_reset(); virtual void machine_reset();
void nvram_init(nvram_device &nvram, void *data, size_t size);
UINT8 kb_read(); UINT8 kb_read();
void update_banks(); void update_banks();