From 32575c5f9abd94a3e9352a8b44734a5210a1e55c Mon Sep 17 00:00:00 2001
From: "R. Belmont" <rb6502@users.noreply.github.com>
Date: Sat, 22 Feb 2014 02:17:38 +0000
Subject: [PATCH] (MESS) apple2: fixed recent regressions (crash and missing
 text drawing) (nw)

nw: why is rgb_t::white actually black?  I couldn't immediately find where it's defined in the core.
---
 src/emu/bus/a2bus/a2ssc.c | 24 +++++++++++++++---------
 src/emu/bus/a2bus/a2ssc.h |  1 +
 src/mess/drivers/apple2.c |  2 +-
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/emu/bus/a2bus/a2ssc.c b/src/emu/bus/a2bus/a2ssc.c
index ec647509737..29004767d1a 100644
--- a/src/emu/bus/a2bus/a2ssc.c
+++ b/src/emu/bus/a2bus/a2ssc.c
@@ -129,7 +129,8 @@ a2bus_ssc_device::a2bus_ssc_device(const machine_config &mconfig, const char *ta
 		device_a2bus_card_interface(mconfig, *this),
 		m_dsw1(*this, "DSW1"),
 		m_dsw2(*this, "DSW2"),
-		m_acia(*this, SSC_ACIA_TAG)
+		m_acia(*this, SSC_ACIA_TAG),
+		m_started(false)
 {
 }
 
@@ -138,7 +139,8 @@ a2bus_ssc_device::a2bus_ssc_device(const machine_config &mconfig, device_type ty
 		device_a2bus_card_interface(mconfig, *this),
 		m_dsw1(*this, "DSW1"),
 		m_dsw2(*this, "DSW2"),
-		m_acia(*this, SSC_ACIA_TAG)
+		m_acia(*this, SSC_ACIA_TAG),
+		m_started(false)
 {
 }
 
@@ -157,6 +159,7 @@ void a2bus_ssc_device::device_start()
 
 void a2bus_ssc_device::device_reset()
 {
+	m_started = true;
 }
 
 /*-------------------------------------------------
@@ -222,15 +225,18 @@ void a2bus_ssc_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data
 
 WRITE_LINE_MEMBER( a2bus_ssc_device::acia_irq_w )
 {
-	if (!(m_dsw2->read() & 4))
+	if (m_started)
 	{
-		if (state)
+		if (!(m_dsw2->read() & 4)) 
 		{
-			raise_slot_irq();
-		}
-		else
-		{
-			lower_slot_irq();
+			if (state)
+			{
+				raise_slot_irq();
+			}
+			else
+			{
+				lower_slot_irq();
+			}
 		}
 	}
 }
diff --git a/src/emu/bus/a2bus/a2ssc.h b/src/emu/bus/a2bus/a2ssc.h
index feeffb306fa..b47fd973b8a 100644
--- a/src/emu/bus/a2bus/a2ssc.h
+++ b/src/emu/bus/a2bus/a2ssc.h
@@ -47,6 +47,7 @@ protected:
 
 private:
 	UINT8 *m_rom;
+	bool m_started;
 };
 
 // device type definition
diff --git a/src/mess/drivers/apple2.c b/src/mess/drivers/apple2.c
index 80cbf6f887c..c232d937eed 100644
--- a/src/mess/drivers/apple2.c
+++ b/src/mess/drivers/apple2.c
@@ -927,7 +927,7 @@ static const rgb_t apple2_palette[] =
 	rgb_t(0x14, 0xF5, 0x3C), /* Light Green */
 	rgb_t(0xD0, 0xDD, 0x8D), /* Yellow */
 	rgb_t(0x72, 0xFF, 0xD0), /* Aquamarine */
-	rgb_t::white
+	rgb_t(0xFF, 0xFF, 0xFF)  /* White */
 };
 
 /* Initialize the palette */