Skip to content

Commit

Permalink
mm1,mephisto3: reorder parent/clones
Browse files Browse the repository at this point in the history 
New working clones
------------------
Mephisto II (set 3) [Berger]
Mephisto ESB II (ESB II board) [hap, Berger]
  • Loading branch information
@happppp
happppp committed Jul 3, 2024
1 parent 7965b9c commit 65d7c09
Show file tree
Hide file tree
Showing 4 changed files with 155 additions and 82 deletions.
32 changes: 16 additions & 16 deletions src/mame/apple/apple2gs.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -839,11 +839,11 @@ void apple2gs_state::machine_reset()
m_ramrd = false;
m_ramwrt = false;
m_ioudis = true;
m_video->set_newvideo(0x01); // verified on ROM03 hardware
m_video->set_newvideo(0x01); // verified on ROM03 hardware
m_clock_frame = 0;
m_slot_irq = false;
m_clkdata = 0;
m_clock_control =0;
m_clock_control = 0;

m_shadow = 0x00;
m_speed = 0x80;
Expand Down Expand Up @@ -1214,20 +1214,20 @@ void apple2gs_state::lc_update(int offset, bool writing)
{
bool old_lcram = m_lcram;

//any even access disables pre-write and writing
// any even access disables pre-write and writing
if ((offset & 1) == 0)
{
m_lcprewrite = false;
m_lcwriteenable = false;
}

//any write disables pre-write
//has no effect on write-enable if writing was enabled already
// any write disables pre-write
// has no effect on write-enable if writing was enabled already
if (writing == true)
{
m_lcprewrite = false;
}
//first odd read enables pre-write, second one enables writing
// first odd read enables pre-write, second one enables writing
else if ((offset & 1) == 1)
{
if (m_lcprewrite == false)
Expand Down Expand Up @@ -1315,7 +1315,7 @@ void apple2gs_state::do_io(int offset)
case 0x20:
break;

case 0x28: // ROMSWITCH - not used by the IIgs firmware or SSW, but does exist at least on ROM 0/1 (need to test on ROM 3 hw)
case 0x28: // ROMSWITCH - not used by the IIgs firmware or SSW, but does exist at least on ROM 0/1 (need to test on ROM 3 hw)
if (!m_is_rom3)
{
m_romswitch = !m_romswitch;
Expand Down Expand Up @@ -2226,7 +2226,7 @@ u8 apple2gs_state::c080_r(offs_t offset)

slow_cycle();

offset &= 0x7F;
offset &= 0x7f;
slot = offset / 0x10;

if (slot == 0)
Expand Down Expand Up @@ -2281,7 +2281,7 @@ void apple2gs_state::c080_w(offs_t offset, u8 data)

slow_cycle();

offset &= 0x7F;
offset &= 0x7f;
slot = offset / 0x10;

if (slot == 0)
Expand Down Expand Up @@ -3177,8 +3177,8 @@ void apple2gs_state::apple2gs_map(address_map &map)

map(0x000400, 0x0007ff).view(m_b0_0400bank);
m_b0_0400bank[0](0x0400, 0x07ff).rw(FUNC(apple2gs_state::b0ram0400_r), FUNC(apple2gs_state::b0ram0400_w)); // wr 0 rd 0
m_b0_0400bank[1](0x0400, 0x07ff).rw(FUNC(apple2gs_state::b1ram0400_r), FUNC(apple2gs_state::b0ram0400_w)); // wr 0 rd 1
m_b0_0400bank[2](0x0400, 0x07ff).rw(FUNC(apple2gs_state::b0ram0400_r), FUNC(apple2gs_state::b1ram0400_w)); // wr 1 rd 0
m_b0_0400bank[1](0x0400, 0x07ff).rw(FUNC(apple2gs_state::b1ram0400_r), FUNC(apple2gs_state::b0ram0400_w)); // wr 0 rd 1
m_b0_0400bank[2](0x0400, 0x07ff).rw(FUNC(apple2gs_state::b0ram0400_r), FUNC(apple2gs_state::b1ram0400_w)); // wr 1 rd 0
m_b0_0400bank[3](0x0400, 0x07ff).rw(FUNC(apple2gs_state::b1ram0400_r), FUNC(apple2gs_state::b1ram0400_w)); // wr 1 rd 1

map(0x000800, 0x001fff).view(m_b0_0800bank);
Expand Down Expand Up @@ -4025,11 +4025,11 @@ ROM_END
} // Anonymous namespace


/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME */
/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME */
COMP( 1989, apple2gs, 0, apple2, apple2gs, apple2gsrom3, apple2gs_state, rom3_init, "Apple Computer", "Apple IIgs (ROM03)", MACHINE_SUPPORTS_SAVE )
COMP( 198?, apple2gsr3p, apple2gs, 0, apple2gs, apple2gsrom3, apple2gs_state, rom3_init, "Apple Computer", "Apple IIgs (ROM03 prototype)", MACHINE_NOT_WORKING )
COMP( 1987, apple2gsr1, apple2gs, 0, apple2gsr1, apple2gs, apple2gs_state, rom1_init, "Apple Computer", "Apple IIgs (ROM01)", MACHINE_SUPPORTS_SAVE )
COMP( 1986, apple2gsr0, apple2gs, 0, apple2gsr1, apple2gs, apple2gs_state, rom1_init, "Apple Computer", "Apple IIgs (ROM00)", MACHINE_SUPPORTS_SAVE )
COMP( 1986, apple2gsr0p, apple2gs, 0, apple2gsr1, apple2gs, apple2gs_state, rom1_init, "Apple Computer", "Apple IIgs (ROM00 prototype 6/19/1986)", MACHINE_SUPPORTS_SAVE )
COMP( 1986, apple2gsr0p2, apple2gs, 0, apple2gsr1, apple2gs, apple2gs_state, rom1_init, "Apple Computer", "Apple IIgs (ROM00 prototype 3/10/1986)", MACHINE_SUPPORTS_SAVE )
COMP( 1987, apple2gsr1, apple2gs, 0, apple2gsr1, apple2gs, apple2gs_state, rom1_init, "Apple Computer", "Apple IIgs (ROM01)", MACHINE_SUPPORTS_SAVE )
COMP( 1986, apple2gsr0, apple2gs, 0, apple2gsr1, apple2gs, apple2gs_state, rom1_init, "Apple Computer", "Apple IIgs (ROM00)", MACHINE_SUPPORTS_SAVE )
COMP( 1986, apple2gsr0p, apple2gs, 0, apple2gsr1, apple2gs, apple2gs_state, rom1_init, "Apple Computer", "Apple IIgs (ROM00 prototype 6/19/1986)", MACHINE_SUPPORTS_SAVE )
COMP( 1986, apple2gsr0p2, apple2gs, 0, apple2gsr1, apple2gs, apple2gs_state, rom1_init, "Apple Computer", "Apple IIgs (ROM00 prototype 3/10/1986)", MACHINE_SUPPORTS_SAVE )
COMP( 1991, apple2gsmt, apple2gs, 0, apple2gsmt, apple2gsrom3, apple2gs_state, rom3_init, "Apple Computer", "Apple IIgs (1991 Mark Twain prototype)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
Loading

0 comments on commit 65d7c09

Please sign in to comment.