summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2022-06-24 06:56:27 +1000
committer Vas Crabb <vas@vastheman.com>2022-06-24 07:05:48 +1000
commitaf97d42dd31cdd7da154108562bb9d08043757b5 (patch)
treecc73e8e44dd26fb21b9f648c83579ba1320a8179 /src/mame/drivers
parente50b51fe7810715e5002a0ab41bbe6dd1db5420d (diff)
bus/nubus: More Mac video card improvements.
Started implementing the Macintosh Display Card CRTC. It gives correct resolutions, although refresh rates are incorrect. Added machine configuration settings allowing several monitors to be selected. Implemented the Macintosh Display Card's packed RGB mode. The base/stride in RGB mode make more sense with this implemented. Cleaned up the code for the SuperMac Spectrum cards, and fixed the garbage at the bottom of the screen on the Spectrum/8. Put a layout with views for common monitor aspect ratios in a place where cards can use it. This is especially useful for the NuBus cards that can support portrait monitors.
Diffstat (limited to 'src/mame/drivers')
-rw-r--r--src/mame/drivers/mac.cpp17
-rw-r--r--src/mame/drivers/macquadra700.cpp9
2 files changed, 17 insertions, 9 deletions
diff --git a/src/mame/drivers/mac.cpp b/src/mame/drivers/mac.cpp
index 3cdf7aaace7..e22f94a3105 100644
--- a/src/mame/drivers/mac.cpp
+++ b/src/mame/drivers/mac.cpp
@@ -14,14 +14,15 @@
#include "emu.h"
#include "includes/mac.h"
+#include "machine/macadb.h"
+
+#include "bus/nscsi/devices.h"
#include "cpu/m68000/m68000.h"
#include "cpu/m6805/m6805.h"
-#include "formats/ap_dsk35.h"
#include "machine/applepic.h"
#include "machine/iwm.h"
#include "machine/swim1.h"
#include "machine/swim2.h"
-#include "bus/nscsi/devices.h"
// NuBus and 030/040 PDS cards
#include "bus/nubus/nubus_48gc.h"
@@ -44,10 +45,12 @@
#include "bus/nubus/pds30_30hr.h"
#include "bus/nubus/pds30_mc30.h"
-#include "machine/macadb.h"
+#include "layout/generic.h"
#include "softlist_dev.h"
#include "speaker.h"
-#include "mac.lh"
+
+#include "formats/ap_dsk35.h"
+
#define C32M (31.3344_MHz_XTAL)
#define C15M (C32M/2)
@@ -928,7 +931,7 @@ void mac_state::maclc(machine_config &config, bool cpu, bool egret, asc_device::
m_screen->set_visarea(0, 640-1, 0, 480-1);
m_screen->set_screen_update(FUNC(mac_state::screen_update_macv8));
m_screen->screen_vblank().set(FUNC(mac_state::mac_rbv_vbl));
- config.set_default_layout(layout_mac);
+ config.set_default_layout(layout_monitors);
m_ram->set_default_size("2M");
m_ram->set_extra_options("4M,6M,8M,10M");
@@ -1134,7 +1137,7 @@ void mac_state::maciici(machine_config &config)
m_screen->set_visarea(0, 640-1, 0, 480-1);
m_screen->set_screen_update(FUNC(mac_state::screen_update_macrbv));
m_screen->screen_vblank().set(FUNC(mac_state::mac_rbv_vbl));
- config.set_default_layout(layout_mac);
+ config.set_default_layout(layout_monitors);
/* internal ram */
m_ram->set_default_size("2M");
@@ -1158,7 +1161,7 @@ void mac_state::maciisi(machine_config &config)
m_screen->set_visarea(0, 640-1, 0, 480-1);
m_screen->set_screen_update(FUNC(mac_state::screen_update_macrbv));
m_screen->screen_vblank().set(FUNC(mac_state::mac_rbv_vbl));
- config.set_default_layout(layout_mac);
+ config.set_default_layout(layout_monitors);
m_ram->set_default_size("2M");
m_ram->set_extra_options("4M,8M,16M,32M,48M,64M,128M");
diff --git a/src/mame/drivers/macquadra700.cpp b/src/mame/drivers/macquadra700.cpp
index d9b0ea00c91..84d2c23e2d2 100644
--- a/src/mame/drivers/macquadra700.cpp
+++ b/src/mame/drivers/macquadra700.cpp
@@ -53,6 +53,9 @@
#define C15M (C7M*2)
#define C32M (C15M*2)
+
+namespace {
+
class macquadra_state : public driver_device
{
public:
@@ -142,9 +145,9 @@ private:
int m_adb_irq_pending = 0;
DECLARE_WRITE_LINE_MEMBER(irq_539x_1_w);
- DECLARE_WRITE_LINE_MEMBER(irq_539x_2_w);
+ [[maybe_unused]] DECLARE_WRITE_LINE_MEMBER(irq_539x_2_w);
DECLARE_WRITE_LINE_MEMBER(drq_539x_1_w);
- DECLARE_WRITE_LINE_MEMBER(drq_539x_2_w);
+ [[maybe_unused]] DECLARE_WRITE_LINE_MEMBER(drq_539x_2_w);
floppy_image_device *m_cur_floppy = nullptr;
int m_hdsel = 0;
@@ -1053,4 +1056,6 @@ ROM_START( macqd700 )
ROM_LOAD( "420dbff3.rom", 0x000000, 0x100000, CRC(88ea2081) SHA1(7a8ee468d16e64f2ad10cb8d1a45e6f07cc9e212) )
ROM_END
+} // anonymous namespace
+
COMP( 1991, macqd700, 0, 0, macqd700, macadb, macquadra_state, init_macqd700, "Apple Computer", "Macintosh Quadra 700", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE)