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

mac.cpp, macpci.cpp: Eliminate machine().device (nw)

Browse Source 
undrfire.h: Fix minor mistake (nw)
This commit is contained in:
AJR 2018-07-04 07:54:22 -04:00
parent 8190d3b13e
commit f7e5fbdd2e
5 changed files with 40 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/mame/includes/mac.h
View File

@ -19,6 +19,7 @@
#include "machine/cuda.h"
#include "bus/nubus/nubus.h"
#include "bus/macpds/macpds.h"
#include "machine/applefdc.h"
#include "machine/ncr539x.h"
#include "machine/ncr5380.h"
#include "machine/mackbd.h"
@ -74,11 +75,13 @@ public:
m_egret(*this, EGRET_TAG),
m_cuda(*this, CUDA_TAG),
m_ram(*this, RAM_TAG),
m_scc(*this, "scc"),
m_539x_1(*this, MAC_539X_1_TAG),
m_539x_2(*this, MAC_539X_2_TAG),
m_ncr5380(*this, "ncr5380"),
m_fdc(*this, "fdc"),
m_mackbd(*this, MACKBD_TAG),
m_rtc(*this,"rtc"),
m_rtc(*this, "rtc"),
m_mouse0(*this, "MOUSE0"),
m_mouse1(*this, "MOUSE1"),
m_mouse2(*this, "MOUSE2"),
@ -239,9 +242,11 @@ private:
optional_device<egret_device> m_egret;
optional_device<cuda_device> m_cuda;
required_device<ram_device> m_ram;
required_device<scc8530_t> m_scc;
optional_device<ncr539x_device> m_539x_1;
optional_device<ncr539x_device> m_539x_2;
optional_device<ncr5380_device> m_ncr5380;
required_device<applefdc_base_device> m_fdc;
optional_device<mackbd_device> m_mackbd;
optional_device<rtc3430042_device> m_rtc;

2
src/mame/includes/macpci.h
View File

@ -37,6 +37,7 @@ public:
m_awacs(*this, "awacs"),
m_cuda(*this, CUDA_TAG),
m_ram(*this, RAM_TAG),
m_scc(*this, "scc"),
m_539x_1(*this, MAC_539X_1_TAG),
m_539x_2(*this, MAC_539X_2_TAG)
{ }
@ -49,6 +50,7 @@ private:
optional_device<awacs_device> m_awacs;
required_device<cuda_device> m_cuda;
required_device<ram_device> m_ram;
required_device<scc8530_t> m_scc;
optional_device<ncr539x_device> m_539x_1;
optional_device<ncr539x_device> m_539x_2;

2
src/mame/includes/undrfire.h
View File

@ -3,7 +3,7 @@
#ifndef MAME_INCLUDES_UNDRFIRE_H
#define MAME_INCLUDES_UNDRFIRE_H
#pragma
#pragma once
#include "machine/eepromser.h"
#include "video/tc0100scn.h"

69
src/mame/machine/mac.cpp
View File

@ -92,7 +92,6 @@
#include "emu.h"
#include "includes/mac.h"
#include "machine/applefdc.h"
#include "machine/sonydriv.h"
#define AUDIO_IS_CLASSIC (m_model <= MODEL_MAC_CLASSIC)
@ -1064,48 +1063,47 @@ WRITE_LINE_MEMBER(mac_state::drq_539x_1_w)
void mac_state::scc_mouse_irq(int x, int y)
{
scc8530_t *scc = machine().device<scc8530_t>("scc");
static int lasty = 0;
static int lastx = 0;
if (x && y)
{
if (m_last_was_x) {
scc->set_status(0x0a);
m_scc->set_status(0x0a);
if(x == 2) {
if(lastx) {
scc->set_reg_a(0, 0x04);
m_scc->set_reg_a(0, 0x04);
m_mouse_bit_x = 0;
} else {
scc->set_reg_a(0, 0x0C);
m_scc->set_reg_a(0, 0x0C);
m_mouse_bit_x = 1;
}
} else {
if(lastx) {
scc->set_reg_a(0, 0x04);
m_scc->set_reg_a(0, 0x04);
m_mouse_bit_x = 1;
} else {
scc->set_reg_a(0, 0x0C);
m_scc->set_reg_a(0, 0x0C);
m_mouse_bit_x = 0;
}
}
lastx = !lastx;
} else {
scc->set_status(0x02);
m_scc->set_status(0x02);
if(y == 2) {
if(lasty) {
scc->set_reg_b(0, 0x04);
m_scc->set_reg_b(0, 0x04);
m_mouse_bit_y = 0;
} else {
scc->set_reg_b(0, 0x0C);
m_scc->set_reg_b(0, 0x0C);
m_mouse_bit_y = 1;
}
} else {
if(lasty) {
scc->set_reg_b(0, 0x04);
m_scc->set_reg_b(0, 0x04);
m_mouse_bit_y = 1;
} else {
scc->set_reg_b(0, 0x0C);
m_scc->set_reg_b(0, 0x0C);
m_mouse_bit_y = 0;
}
}
@ -1117,41 +1115,41 @@ void mac_state::scc_mouse_irq(int x, int y)
else
{
if (x) {
scc->set_status(0x0a);
m_scc->set_status(0x0a);
if(x == 2) {
if(lastx) {
scc->set_reg_a(0, 0x04);
m_scc->set_reg_a(0, 0x04);
m_mouse_bit_x = 0;
} else {
scc->set_reg_a(0, 0x0C);
m_scc->set_reg_a(0, 0x0C);
m_mouse_bit_x = 1;
}
} else {
if(lastx) {
scc->set_reg_a(0, 0x04);
m_scc->set_reg_a(0, 0x04);
m_mouse_bit_x = 1;
} else {
scc->set_reg_a(0, 0x0C);
m_scc->set_reg_a(0, 0x0C);
m_mouse_bit_x = 0;
}
}
lastx = !lastx;
} else {
scc->set_status(0x02);
m_scc->set_status(0x02);
if(y == 2) {
if(lasty) {
scc->set_reg_b(0, 0x04);
m_scc->set_reg_b(0, 0x04);
m_mouse_bit_y = 0;
} else {
scc->set_reg_b(0, 0x0C);
m_scc->set_reg_b(0, 0x0C);
m_mouse_bit_y = 1;
}
} else {
if(lasty) {
scc->set_reg_b(0, 0x04);
m_scc->set_reg_b(0, 0x04);
m_mouse_bit_y = 1;
} else {
scc->set_reg_b(0, 0x0C);
m_scc->set_reg_b(0, 0x0C);
m_mouse_bit_y = 0;
}
}
@ -1166,10 +1164,9 @@ void mac_state::scc_mouse_irq(int x, int y)
READ16_MEMBER ( mac_state::mac_scc_r )
{
scc8530_t *scc = machine().device<scc8530_t>("scc");
uint16_t result;
result = scc->reg_r(space, offset);
result = m_scc->reg_r(space, offset);
return (result << 8) | result;
}
@ -1177,14 +1174,12 @@ READ16_MEMBER ( mac_state::mac_scc_r )
WRITE16_MEMBER ( mac_state::mac_scc_w )
{
scc8530_t *scc = machine().device<scc8530_t>("scc");
scc->reg_w(space, offset, data);
m_scc->reg_w(space, offset, data);
}
WRITE16_MEMBER ( mac_state::mac_scc_2_w )
{
scc8530_t *scc = machine().device<scc8530_t>("scc");
scc->reg_w(space, offset, data >> 8);
m_scc->reg_w(space, offset, data >> 8);
}
/* ********************************** *
@ -1201,10 +1196,7 @@ READ16_MEMBER ( mac_state::mac_iwm_r )
* this driver along
*/
uint16_t result = 0;
applefdc_base_device *fdc = machine().device<applefdc_base_device>("fdc");
result = fdc->read(offset >> 8);
uint16_t result = m_fdc->read(offset >> 8);
if (LOG_MAC_IWM)
printf("%s mac_iwm_r: offset=0x%08x mem_mask %04x = %02x\n", machine().describe_context().c_str(), offset, mem_mask, result);
@ -1214,15 +1206,13 @@ READ16_MEMBER ( mac_state::mac_iwm_r )
WRITE16_MEMBER ( mac_state::mac_iwm_w )
{
applefdc_base_device *fdc = machine().device<applefdc_base_device>("fdc");
if (LOG_MAC_IWM)
printf("mac_iwm_w: offset=0x%08x data=0x%04x mask %04x (PC=%x)\n", offset, data, mem_mask, m_maincpu->pc());
if (ACCESSING_BITS_0_7)
fdc->write((offset >> 8), data & 0xff);
m_fdc->write((offset >> 8), data & 0xff);
else
fdc->write((offset >> 8), data>>8);
m_fdc->write((offset >> 8), data>>8);
}
WRITE_LINE_MEMBER(mac_state::mac_adb_via_out_cb2)
@ -1451,12 +1441,11 @@ READ8_MEMBER(mac_state::mac_via_in_b_pmu)
WRITE8_MEMBER(mac_state::mac_via_out_a)
{
device_t *fdc = machine().device("fdc");
// printf("%s VIA1 OUT A: %02x\n", machine().describe_context().c_str(), data);
set_scc_waitrequest((data & 0x80) >> 7);
m_screen_buffer = (data & 0x40) >> 6;
sony_set_sel_line(fdc,(data & 0x20) >> 5);
sony_set_sel_line(m_fdc.target(), (data & 0x20) >> 5);
if (m_model == MODEL_MAC_SE) // on SE this selects which floppy drive (0 = upper, 1 = lower)
{
m_drive_select = ((data & 0x10) >> 4);
@ -1589,9 +1578,7 @@ WRITE8_MEMBER(mac_state::mac_via_out_b_pmu)
{
// printf("%s VIA1 OUT B: %02x\n", machine().describe_context().c_str(), data);
device_t *fdc = machine().device("fdc");
sony_set_sel_line(fdc,(data & 0x20) >> 5);
sony_set_sel_line(m_fdc.target(), (data & 0x20) >> 5);
m_drive_select = ((data & 0x10) >> 4);
if ((data & 1) && !(m_pm_req & 1))

11
src/mame/machine/macpci.cpp
View File

@ -168,23 +168,18 @@ READ32_MEMBER(macpci_state::mac_read_id)
READ16_MEMBER ( macpci_state::mac_scc_r )
{
scc8530_t *scc = machine().device<scc8530_t>("scc");
uint16_t result;
result = scc->reg_r(space, offset);
uint16_t result = m_scc->reg_r(space, offset);
return (result << 8) | result;
}
WRITE16_MEMBER ( macpci_state::mac_scc_w )
{
scc8530_t *scc = machine().device<scc8530_t>("scc");
scc->reg_w(space, offset, data);
m_scc->reg_w(space, offset, data);
}
WRITE16_MEMBER ( macpci_state::mac_scc_2_w )
{
scc8530_t *scc = machine().device<scc8530_t>("scc");
scc->reg_w(space, offset, data >> 8);
m_scc->reg_w(space, offset, data >> 8);
}
READ8_MEMBER(macpci_state::mac_5396_r)