summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/c64.cpp
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2019-03-26 11:13:37 +1100
committer Vas Crabb <vas@vastheman.com>2019-03-26 11:13:37 +1100
commit97b67170277437131adf6ed4d60139c172529e4f (patch)
tree7a5cbf608f191075f1612b1af15832c206a3fe2d /src/mame/drivers/c64.cpp
parentb380514764cf857469bae61c11143a19f79a74c5 (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/mame/drivers/c64.cpp')
-rw-r--r--src/mame/drivers/c64.cpp58
1 files changed, 29 insertions, 29 deletions
diff --git a/src/mame/drivers/c64.cpp b/src/mame/drivers/c64.cpp
index f606bf6ce02..d532e00c410 100644
--- a/src/mame/drivers/c64.cpp
+++ b/src/mame/drivers/c64.cpp
@@ -332,14 +332,14 @@ uint8_t c64_state::read_memory(address_space &space, offs_t offset, offs_t va, i
case 1:
case 2:
case 3: // VIC
- data = m_vic->read(space, offset & 0x3f);
+ data = m_vic->read(offset & 0x3f);
break;
case 4:
case 5:
case 6:
case 7: // SID
- data = m_sid->read(space, offset & 0x1f);
+ data = m_sid->read(offset & 0x1f);
break;
case 0x8:
@@ -350,11 +350,11 @@ uint8_t c64_state::read_memory(address_space &space, offs_t offset, offs_t va, i
break;
case 0xc: // CIA1
- data = m_cia1->read(space, offset & 0x0f);
+ data = m_cia1->read(offset & 0x0f);
break;
case 0xd: // CIA2
- data = m_cia2->read(space, offset & 0x0f);
+ data = m_cia2->read(offset & 0x0f);
break;
case 0xe: // I/O1
@@ -369,7 +369,7 @@ uint8_t c64_state::read_memory(address_space &space, offs_t offset, offs_t va, i
int roml = BIT(plaout, PLA_OUT_ROML);
int romh = BIT(plaout, PLA_OUT_ROMH);
- return m_exp->cd_r(space, offset, data, sphi2, ba, roml, romh, io1, io2);
+ return m_exp->cd_r(offset, data, sphi2, ba, roml, romh, io1, io2);
}
@@ -404,14 +404,14 @@ void c64_state::write_memory(address_space &space, offs_t offset, uint8_t data,
case 1:
case 2:
case 3: // VIC
- m_vic->write(space, offset & 0x3f, data);
+ m_vic->write(offset & 0x3f, data);
break;
case 4:
case 5:
case 6:
case 7: // SID
- m_sid->write(space, offset & 0x1f, data);
+ m_sid->write(offset & 0x1f, data);
break;
case 0x8:
@@ -422,11 +422,11 @@ void c64_state::write_memory(address_space &space, offs_t offset, uint8_t data,
break;
case 0xc: // CIA1
- m_cia1->write(space, offset & 0x0f, data);
+ m_cia1->write(offset & 0x0f, data);
break;
case 0xd: // CIA2
- m_cia2->write(space, offset & 0x0f, data);
+ m_cia2->write(offset & 0x0f, data);
break;
case 0xe: // I/O1
@@ -441,7 +441,7 @@ void c64_state::write_memory(address_space &space, offs_t offset, uint8_t data,
int roml = BIT(plaout, PLA_OUT_ROML);
int romh = BIT(plaout, PLA_OUT_ROMH);
- m_exp->cd_w(space, offset, data, sphi2, ba, roml, romh, io1, io2);
+ m_exp->cd_w(offset, data, sphi2, ba, roml, romh, io1, io2);
}
@@ -692,7 +692,7 @@ READ8_MEMBER( c64_state::sid_potx_r )
{
uint8_t data = 0xff;
- switch (m_cia1->read_pa() >> 6)
+ switch (m_cia1->pa_r() >> 6)
{
case 1: data = m_joy1->read_pot_x(); break;
case 2: data = m_joy2->read_pot_x(); break;
@@ -719,7 +719,7 @@ READ8_MEMBER( c64_state::sid_poty_r )
{
uint8_t data = 0xff;
- switch (m_cia1->read_pa() >> 6)
+ switch (m_cia1->pa_r() >> 6)
{
case 1: data = m_joy1->read_pot_y(); break;
case 2: data = m_joy2->read_pot_y(); break;
@@ -773,7 +773,7 @@ READ8_MEMBER( c64_state::cia1_pa_r )
data &= ~(!BIT(joy_b, 5) << 4);
// keyboard
- uint8_t cia1_pb = m_cia1->read_pb();
+ uint8_t cia1_pb = m_cia1->pb_r();
uint32_t row[8] = { m_row[0]->read(), m_row[1]->read() & m_lock->read(), m_row[2]->read(), m_row[3]->read(),
m_row[4]->read(), m_row[5]->read(), m_row[6]->read(), m_row[7]->read() };
@@ -841,7 +841,7 @@ READ8_MEMBER( c64_state::cia1_pb_r )
data &= ~(!BIT(joy_a, 5) << 4);
// keyboard
- uint8_t cia1_pa = m_cia1->read_pa();
+ uint8_t cia1_pa = m_cia1->pa_r();
if (!BIT(cia1_pa, 7)) data &= m_row[7]->read();
if (!BIT(cia1_pa, 6)) data &= m_row[6]->read();
@@ -1260,7 +1260,7 @@ void c64_state::machine_reset()
//**************************************************************************
//-------------------------------------------------
-// MACHINE_CONFIG( ntsc )
+// machine_config( ntsc )
//-------------------------------------------------
void c64_state::ntsc(machine_config &config)
@@ -1361,8 +1361,8 @@ void c64_state::ntsc(machine_config &config)
m_user->pl_handler().set(FUNC(c64_state::write_user_pb7));
m_user->pm_handler().set(FUNC(c64_state::write_user_pa2));
- quickload_image_device &quickload(QUICKLOAD(config, "quickload", 0));
- quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(c64_state, cbm_c64), this), "p00,prg,t64", CBM_QUICKLOAD_DELAY_SECONDS);
+ quickload_image_device &quickload(QUICKLOAD(config, "quickload"));
+ quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(c64_state, cbm_c64), this), "p00,prg,t64", CBM_QUICKLOAD_DELAY);
// software list
SOFTWARE_LIST(config, "cart_list_vic10").set_original("vic10");
@@ -1380,7 +1380,7 @@ void c64_state::ntsc(machine_config &config)
//-------------------------------------------------
-// MACHINE_CONFIG( pet64 )
+// machine_config( pet64 )
//-------------------------------------------------
void c64_state::pet64(machine_config &config)
@@ -1391,7 +1391,7 @@ void c64_state::pet64(machine_config &config)
//-------------------------------------------------
-// MACHINE_CONFIG( ntsc_sx )
+// machine_config( ntsc_sx )
//-------------------------------------------------
void sx64_state::ntsc_sx(machine_config &config)
@@ -1409,7 +1409,7 @@ void sx64_state::ntsc_sx(machine_config &config)
//-------------------------------------------------
-// MACHINE_CONFIG( ntsc_dx )
+// machine_config( ntsc_dx )
//-------------------------------------------------
void sx64_state::ntsc_dx(machine_config &config)
@@ -1422,7 +1422,7 @@ void sx64_state::ntsc_dx(machine_config &config)
//-------------------------------------------------
-// MACHINE_CONFIG( ntsc_c )
+// machine_config( ntsc_c )
//-------------------------------------------------
void c64c_state::ntsc_c(machine_config &config)
@@ -1436,7 +1436,7 @@ void c64c_state::ntsc_c(machine_config &config)
//-------------------------------------------------
-// MACHINE_CONFIG( pal )
+// machine_config( pal )
//-------------------------------------------------
void c64_state::pal(machine_config &config)
@@ -1537,8 +1537,8 @@ void c64_state::pal(machine_config &config)
m_user->pl_handler().set(FUNC(c64_state::write_user_pb7));
m_user->pm_handler().set(FUNC(c64_state::write_user_pa2));
- quickload_image_device &quickload(QUICKLOAD(config, "quickload", 0));
- quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(c64_state, cbm_c64), this), "p00,prg,t64", CBM_QUICKLOAD_DELAY_SECONDS);
+ quickload_image_device &quickload(QUICKLOAD(config, "quickload"));
+ quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(c64_state, cbm_c64), this), "p00,prg,t64", CBM_QUICKLOAD_DELAY);
// software list
SOFTWARE_LIST(config, "cart_list_vic10").set_original("vic10");
@@ -1556,7 +1556,7 @@ void c64_state::pal(machine_config &config)
//-------------------------------------------------
-// MACHINE_CONFIG( pal_sx )
+// machine_config( pal_sx )
//-------------------------------------------------
void sx64_state::pal_sx(machine_config &config)
@@ -1574,7 +1574,7 @@ void sx64_state::pal_sx(machine_config &config)
//-------------------------------------------------
-// MACHINE_CONFIG( pal_c )
+// machine_config( pal_c )
//-------------------------------------------------
void c64c_state::pal_c(machine_config &config)
@@ -1588,7 +1588,7 @@ void c64c_state::pal_c(machine_config &config)
//-------------------------------------------------
-// MACHINE_CONFIG( pal_gs )
+// machine_config( pal_gs )
//-------------------------------------------------
void c64gs_state::pal_gs(machine_config &config)
@@ -1687,8 +1687,8 @@ void c64gs_state::pal_gs(machine_config &config)
m_user->pl_handler().set(FUNC(c64_state::write_user_pb7));
m_user->pm_handler().set(FUNC(c64_state::write_user_pa2));
- quickload_image_device &quickload(QUICKLOAD(config, "quickload", 0));
- quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(c64_state, cbm_c64), this), "p00,prg,t64", CBM_QUICKLOAD_DELAY_SECONDS);
+ quickload_image_device &quickload(QUICKLOAD(config, "quickload"));
+ quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(c64_state, cbm_c64), this), "p00,prg,t64", CBM_QUICKLOAD_DELAY);
// software list
SOFTWARE_LIST(config, "cart_list_vic10").set_original("vic10");