From bcc9c16bf75ffc4723306813c499f10d5684ec6f Mon Sep 17 00:00:00 2001
From: David Given <dg@cowlark.com>
Date: Sat, 9 Feb 2019 13:42:09 +0100
Subject: [PATCH] More z80ex removal.

---
 plat/cpm/emu/emulator.c | 2 +-
 plat/cpm/emu/globals.h  | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/plat/cpm/emu/emulator.c b/plat/cpm/emu/emulator.c
index eb192dbf8..09d58e18b 100644
--- a/plat/cpm/emu/emulator.c
+++ b/plat/cpm/emu/emulator.c
@@ -77,7 +77,7 @@ static void cmd_register(void)
 
 	if (w1 && w2)
 	{
-		Z80_REG_T reg = -1;
+		int reg = -1;
 		if (strcmp(w1, "sp") == 0)
 			reg = SP;
 		else if (strcmp(w1, "pc") == 0)
diff --git a/plat/cpm/emu/globals.h b/plat/cpm/emu/globals.h
index 613b49061..6979f31aa 100644
--- a/plat/cpm/emu/globals.h
+++ b/plat/cpm/emu/globals.h
@@ -3,7 +3,6 @@
 
 #include <stdbool.h>
 
-extern Z80EX_CONTEXT* z80;
 extern uint8_t ram[0x10000];
 
 extern void emulator_init(void);