diff --git a/src/mame/drivers/hh_pic16.cpp b/src/mame/drivers/hh_pic16.cpp
index f1535735fbd..8207a4af5f5 100644
--- a/src/mame/drivers/hh_pic16.cpp
+++ b/src/mame/drivers/hh_pic16.cpp
@@ -9,7 +9,7 @@
   serial  device  etc.
 -----------------------------------------------------------
  *020     1650    19??, GI Economega IV TV PPL Tuning System Control
- *024     1655    1979, <unknown> Football (have dump)
+ *024     1655    1979, Toytronic? Football (have dump)
  *033     1655A   1979, Toytronic Football (have dump)
  @036     1655A   1979, Ideal Maniac
  *043     1655A   1979, Calfax/Caprice Pro-Action Baseball (have dump)
@@ -45,6 +45,7 @@
 #include "machine/clock.h"
 #include "sound/speaker.h"
 
+#include "hccbaskb.lh"
 #include "leboom.lh" // clickable
 #include "maniac.lh" // clickable
 #include "melodym.lh" // clickable
@@ -939,7 +940,7 @@ WRITE8_MEMBER(hccbaskb_state::write_b)
 WRITE8_MEMBER(hccbaskb_state::write_c)
 {
 	// C0-C6: led data
-	m_c = data;
+	m_c = ~data;
 	prepare_display();
 }
 
@@ -977,7 +978,7 @@ static MACHINE_CONFIG_START( hccbaskb, hccbaskb_state )
 	MCFG_PIC16C5x_WRITE_C_CB(WRITE8(hccbaskb_state, write_c))
 
 	MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_pic16_state, display_decay_tick, attotime::from_msec(1))
-	//MCFG_DEFAULT_LAYOUT(layout_hccbaskb)
+	MCFG_DEFAULT_LAYOUT(layout_hccbaskb)
 
 	/* sound hardware */
 	MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -1042,4 +1043,4 @@ CONS( 1979, maniac,    0,        0, maniac,   maniac,   driver_device, 0, "Ideal
 CONS( 1980, leboom,    0,        0, leboom,   leboom,   driver_device, 0, "Lakeside", "Le Boom", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND | MACHINE_CLICKABLE_ARTWORK )
 
 CONS( 1979, rockpin,   0,        0, rockpin,  rockpin,  driver_device, 0, "Tiger Electronics", "Rocket Pinball", MACHINE_SUPPORTS_SAVE )
-CONS( 1979, hccbaskb,  0,        0, hccbaskb, hccbaskb, driver_device, 0, "Tiger Electronics", "Half Court Computer Basketball", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
+CONS( 1979, hccbaskb,  0,        0, hccbaskb, hccbaskb, driver_device, 0, "Tiger Electronics", "Half Court Computer Basketball", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/layout/hccbaskb.lay b/src/mame/layout/hccbaskb.lay
new file mode 100644
index 00000000000..654f88ae35b
--- /dev/null
+++ b/src/mame/layout/hccbaskb.lay
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<mamelayout version="2">
+
+<!-- define elements -->
+
+	<element name="led" defstate="0">
+		<disk state="0"><color red="0.2" green="0.04" blue="0.05" /></disk>
+		<disk state="1"><color red="1.0" green="0.2" blue="0.23" /></disk>
+	</element>
+
+	<element name="digit" defstate="0">
+		<led7seg><color red="1.0" green="0.2" blue="0.23" /></led7seg>
+	</element>
+
+
+<!-- build screen -->
+
+	<view name="Internal Layout">
+		<bounds left="0" right="50" top="0" bottom="50" />
+
+	<!-- bezel -->
+
+	<!-- leds -->
+
+		<bezel name="digit6" element="digit"><bounds x="0" y="0" width="2" height="3" /></bezel>
+		<bezel name="digit5" element="digit"><bounds x="2" y="0" width="2" height="3" /></bezel>
+
+		<bezel name="0.5" element="led"><bounds x="12" y="6" width="1" height="1" /></bezel>
+
+		<bezel name="4.0" element="led"><bounds x="4"  y="8" width="1" height="1" /></bezel>
+		<bezel name="4.1" element="led"><bounds x="8"  y="8" width="1" height="1" /></bezel>
+		<bezel name="4.2" element="led"><bounds x="12" y="8" width="1" height="1" /></bezel>
+		<bezel name="4.3" element="led"><bounds x="16" y="8" width="1" height="1" /></bezel>
+		<bezel name="4.4" element="led"><bounds x="20" y="8" width="1" height="1" /></bezel>
+
+		<bezel name="3.0" element="led"><bounds x="4"  y="12" width="1" height="1" /></bezel>
+		<bezel name="3.1" element="led"><bounds x="8"  y="12" width="1" height="1" /></bezel>
+		<bezel name="3.2" element="led"><bounds x="12" y="12" width="1" height="1" /></bezel>
+		<bezel name="3.3" element="led"><bounds x="16" y="12" width="1" height="1" /></bezel>
+		<bezel name="3.4" element="led"><bounds x="20" y="12" width="1" height="1" /></bezel>
+
+		<bezel name="2.0" element="led"><bounds x="4"  y="16" width="1" height="1" /></bezel>
+		<bezel name="2.1" element="led"><bounds x="8"  y="16" width="1" height="1" /></bezel>
+		<bezel name="2.2" element="led"><bounds x="12" y="16" width="1" height="1" /></bezel>
+		<bezel name="2.3" element="led"><bounds x="16" y="16" width="1" height="1" /></bezel>
+		<bezel name="2.4" element="led"><bounds x="20" y="16" width="1" height="1" /></bezel>
+
+		<bezel name="1.0" element="led"><bounds x="4"  y="20" width="1" height="1" /></bezel>
+		<bezel name="1.1" element="led"><bounds x="8"  y="20" width="1" height="1" /></bezel>
+		<bezel name="1.2" element="led"><bounds x="12" y="20" width="1" height="1" /></bezel>
+		<bezel name="1.3" element="led"><bounds x="16" y="20" width="1" height="1" /></bezel>
+		<bezel name="1.4" element="led"><bounds x="20" y="20" width="1" height="1" /></bezel>
+
+		<bezel name="0.0" element="led"><bounds x="4"  y="24" width="1" height="1" /></bezel>
+		<bezel name="0.1" element="led"><bounds x="8"  y="24" width="1" height="1" /></bezel>
+		<bezel name="0.2" element="led"><bounds x="12" y="24" width="1" height="1" /></bezel>
+		<bezel name="0.3" element="led"><bounds x="16" y="24" width="1" height="1" /></bezel>
+		<bezel name="0.4" element="led"><bounds x="20" y="24" width="1" height="1" /></bezel>
+
+	</view>
+</mamelayout>