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

move enums out of global namespace to avoid LTO conflict (nw)

Browse Source
This commit is contained in:
smf- 2017-12-11 20:33:53 +00:00
parent 7ee8bf4707
commit 166bc6add8
3 changed files with 136 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,6 +48,74 @@
#define ADB_IS_PM_VIA2_CLASS (m_model >= MODEL_MAC_PB140 && m_model <= MODEL_MAC_PBDUO_270c) #define ADB_IS_PM_VIA2_CLASS (m_model >= MODEL_MAC_PB140 && m_model <= MODEL_MAC_PBDUO_270c)
#define ADB_IS_PM_CLASS ((m_model >= MODEL_MAC_PORTABLE && m_model <= MODEL_MAC_PB100) || (m_model >= MODEL_MAC_PB140 && m_model <= MODEL_MAC_PBDUO_270c)) #define ADB_IS_PM_CLASS ((m_model >= MODEL_MAC_PORTABLE && m_model <= MODEL_MAC_PB100) || (m_model >= MODEL_MAC_PB140 && m_model <= MODEL_MAC_PBDUO_270c))
// video parameters for classic Macs
#define MAC_H_VIS (512)
#define MAC_V_VIS (342)
#define MAC_H_TOTAL (704) // (512+192)
#define MAC_V_TOTAL (370) // (342+28)
/*----------- defined in machine/mac.c -----------*/
void mac_fdc_set_enable_lines(device_t *device, int enable_mask);
/* Mac driver data */
class mac_state : public driver_device
{
public:
mac_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_via1(*this, "via6522_0"),
m_via2(*this, "via6522_1"),
m_asc(*this, "asc"),
m_awacs(*this, "awacs"),
m_egret(*this, EGRET_TAG),
m_cuda(*this, CUDA_TAG),
m_ram(*this, RAM_TAG),
m_539x_1(*this, MAC_539X_1_TAG),
m_539x_2(*this, MAC_539X_2_TAG),
m_ncr5380(*this, "ncr5380"),
m_mackbd(*this, MACKBD_TAG),
m_rtc(*this,"rtc"),
m_mouse0(*this, "MOUSE0"),
m_mouse1(*this, "MOUSE1"),
m_mouse2(*this, "MOUSE2"),
m_keys(*this, "KEY%u", 0),
m_montype(*this, "MONTYPE"),
m_snd_enable(false),
m_main_buffer(true),
m_snd_vol(7),
m_vram(*this,"vram"),
m_vram16(*this,"vram16"),
m_via2_ca1_hack(0),
m_screen(*this, "screen"),
m_palette(*this, "palette"),
m_dac(*this, "dac")
{
}
required_device<cpu_device> m_maincpu;
required_device<via6522_device> m_via1;
optional_device<via6522_device> m_via2;
optional_device<asc_device> m_asc;
optional_device<awacs_device> m_awacs;
optional_device<egret_device> m_egret;
optional_device<cuda_device> m_cuda;
required_device<ram_device> m_ram;
optional_device<ncr539x_device> m_539x_1;
optional_device<ncr539x_device> m_539x_2;
optional_device<ncr5380_device> m_ncr5380;
optional_device<mackbd_device> m_mackbd;
optional_device<rtc3430042_device> m_rtc;
required_ioport m_mouse0, m_mouse1, m_mouse2;
optional_ioport_array<7> m_keys;
optional_ioport m_montype;
virtual void machine_start() override;
virtual void machine_reset() override;
/* for Egret and CUDA streaming MCU commands, command types */ /* for Egret and CUDA streaming MCU commands, command types */
enum mac_streaming_t enum mac_streaming_t
{ {
@ -138,74 +206,6 @@ enum model_t
MODEL_MAC_POWERMAC_8100 MODEL_MAC_POWERMAC_8100
}; };
// video parameters for classic Macs
#define MAC_H_VIS (512)
#define MAC_V_VIS (342)
#define MAC_H_TOTAL (704) // (512+192)
#define MAC_V_TOTAL (370) // (342+28)
/*----------- defined in machine/mac.c -----------*/
void mac_fdc_set_enable_lines(device_t *device, int enable_mask);
/* Mac driver data */
class mac_state : public driver_device
{
public:
mac_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_via1(*this, "via6522_0"),
m_via2(*this, "via6522_1"),
m_asc(*this, "asc"),
m_awacs(*this, "awacs"),
m_egret(*this, EGRET_TAG),
m_cuda(*this, CUDA_TAG),
m_ram(*this, RAM_TAG),
m_539x_1(*this, MAC_539X_1_TAG),
m_539x_2(*this, MAC_539X_2_TAG),
m_ncr5380(*this, "ncr5380"),
m_mackbd(*this, MACKBD_TAG),
m_rtc(*this,"rtc"),
m_mouse0(*this, "MOUSE0"),
m_mouse1(*this, "MOUSE1"),
m_mouse2(*this, "MOUSE2"),
m_keys(*this, "KEY%u", 0),
m_montype(*this, "MONTYPE"),
m_snd_enable(false),
m_main_buffer(true),
m_snd_vol(7),
m_vram(*this,"vram"),
m_vram16(*this,"vram16"),
m_via2_ca1_hack(0),
m_screen(*this, "screen"),
m_palette(*this, "palette"),
m_dac(*this, "dac")
{
}
required_device<cpu_device> m_maincpu;
required_device<via6522_device> m_via1;
optional_device<via6522_device> m_via2;
optional_device<asc_device> m_asc;
optional_device<awacs_device> m_awacs;
optional_device<egret_device> m_egret;
optional_device<cuda_device> m_cuda;
required_device<ram_device> m_ram;
optional_device<ncr539x_device> m_539x_1;
optional_device<ncr539x_device> m_539x_2;
optional_device<ncr5380_device> m_ncr5380;
optional_device<mackbd_device> m_mackbd;
optional_device<rtc3430042_device> m_rtc;
required_ioport m_mouse0, m_mouse1, m_mouse2;
optional_ioport_array<7> m_keys;
optional_ioport m_montype;
virtual void machine_start() override;
virtual void machine_reset() override;
model_t m_model; model_t m_model;
uint32_t m_overlay; uint32_t m_overlay;

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

@ -25,6 +25,33 @@
#define MAC_539X_1_TAG "539x_1" #define MAC_539X_1_TAG "539x_1"
#define MAC_539X_2_TAG "539x_2" #define MAC_539X_2_TAG "539x_2"
/* Mac driver data */
class macpci_state : public driver_device
{
public:
macpci_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_via1(*this, "via6522_0"),
m_awacs(*this, "awacs"),
m_cuda(*this, CUDA_TAG),
m_ram(*this, RAM_TAG),
m_539x_1(*this, MAC_539X_1_TAG),
m_539x_2(*this, MAC_539X_2_TAG)
{ }
required_device<cpu_device> m_maincpu;
required_device<via6522_device> m_via1;
optional_device<awacs_device> m_awacs;
required_device<cuda_device> m_cuda;
required_device<ram_device> m_ram;
optional_device<ncr539x_device> m_539x_1;
optional_device<ncr539x_device> m_539x_2;
virtual void machine_start() override;
virtual void machine_reset() override;
/* tells which model is being emulated (set by macxxx_init) */ /* tells which model is being emulated (set by macxxx_init) */
enum model_t enum model_t
{ {
@ -70,34 +97,6 @@ enum model_t
}; };
/* Mac driver data */
class macpci_state : public driver_device
{
public:
macpci_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_via1(*this, "via6522_0"),
m_awacs(*this, "awacs"),
m_cuda(*this, CUDA_TAG),
m_ram(*this, RAM_TAG),
m_539x_1(*this, MAC_539X_1_TAG),
m_539x_2(*this, MAC_539X_2_TAG)
{ }
required_device<cpu_device> m_maincpu;
required_device<via6522_device> m_via1;
optional_device<awacs_device> m_awacs;
required_device<cuda_device> m_cuda;
required_device<ram_device> m_ram;
optional_device<ncr539x_device> m_539x_1;
optional_device<ncr539x_device> m_539x_2;
virtual void machine_start() override;
virtual void machine_reset() override;
model_t m_model; model_t m_model;
// 60.15 Hz timer for RBV/V8/Sonora/Eagle/VASP/etc. // 60.15 Hz timer for RBV/V8/Sonora/Eagle/VASP/etc.

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

@ -127,7 +127,7 @@ void mac_fdc_set_enable_lines(device_t *device, int enable_mask)
{ {
mac_state *mac = device->machine().driver_data<mac_state>(); mac_state *mac = device->machine().driver_data<mac_state>();
if (mac->m_model != MODEL_MAC_SE) if (mac->m_model != mac_state::MODEL_MAC_SE)
{ {
sony_set_enable_lines(device, enable_mask); sony_set_enable_lines(device, enable_mask);
} }