From 8de1cf4b4ac0fce258d7832493fc955a9650e58b Mon Sep 17 00:00:00 2001
From: smf- <smf-@users.noreply.github.com>
Date: Sat, 26 Jan 2013 14:16:03 +0000
Subject: [PATCH] removed runtime ioport tag lookups [smf]

---
 src/mess/drivers/clcd.c | 58 +++++++++++++++++++++++++++++++++++++----
 1 file changed, 53 insertions(+), 5 deletions(-)

diff --git a/src/mess/drivers/clcd.c b/src/mess/drivers/clcd.c
index d4e1bb9fa17..1ef5b52d69c 100644
--- a/src/mess/drivers/clcd.c
+++ b/src/mess/drivers/clcd.c
@@ -15,8 +15,6 @@
 #include "machine/6551acia.h"
 #include "rendlay.h"
 
-static const char *const keyColumns[] = { "COL0", "COL1", "COL2", "COL3", "COL4", "COL5", "COL6", "COL7" };
-
 class clcd_state : public driver_device
 {
 public:
@@ -24,7 +22,16 @@ public:
 		: driver_device(mconfig, type, tag),
 		m_ram(*this,"ram"),
 		keyClockState(0),
-		keyReadState(0)
+		keyReadState(0),
+		m_col0(*this,"COL0"),
+		m_col1(*this,"COL1"),
+		m_col2(*this,"COL2"),
+		m_col3(*this,"COL3"),
+		m_col4(*this,"COL4"),
+		m_col5(*this,"COL5"),
+		m_col6(*this,"COL6"),
+		m_col7(*this,"COL7"),
+		m_special(*this,"SPECIAL")
 	{
 	}
 
@@ -68,6 +75,38 @@ public:
 		keyColumnSelect = data;
 	}
 
+	int read_column( int column )
+	{
+		switch( column )
+		{
+		case 0:
+			return m_col0->read();
+		
+		case 1:
+			return m_col1->read();
+
+		case 2:
+			return m_col2->read();
+
+		case 3:
+			return m_col3->read();
+
+		case 4:
+			return m_col4->read();
+
+		case 5:
+			return m_col5->read();
+
+		case 6:
+			return m_col6->read();
+
+		case 7:
+			return m_col7->read();
+		}
+
+		return 0;
+	}
+
 	WRITE8_MEMBER( via0_pb_w )
 	{
 		int newKeyReadState = data & 1;
@@ -77,13 +116,13 @@ public:
 
 			if( newKeyReadState != 0 )
 			{
-				keyData = ioport( "SPECIAL" )->read();
+				keyData = m_special->read();
 
 				for( int i = 0; i < 8; i++ )
 				{
 					if( ( keyColumnSelect & ( 128 >> i ) ) == 0 )
 					{
-						keyData |= ioport( keyColumns[ i ] )->read() << 8;
+						keyData |= read_column( i ) << 8;
 					}
 				}
 
@@ -125,6 +164,15 @@ private:
 	int keyClockState;
 	int keyReadState;
 	virtual void palette_init();
+	required_ioport m_col0;
+	required_ioport m_col1;
+	required_ioport m_col2;
+	required_ioport m_col3;
+	required_ioport m_col4;
+	required_ioport m_col5;
+	required_ioport m_col6;
+	required_ioport m_col7;
+	required_ioport m_special;
 };
 
 static ADDRESS_MAP_START( clcd_mem, AS_PROGRAM, 8, clcd_state )