Index: emu/lcd.c
===================================================================
--- emu/lcd.c	(revision 99cc90a3bc312a3c9a158396572db0c6a3574086)
+++ emu/lcd.c	(revision 1b302171955f44af8064df04dfbb88bf685833fb)
@@ -36,23 +36,13 @@
 #define REG_COM 1
 
-#define G_NONE		0x00
-#define	G_INIT		0x40
-#define	G_MWRITE	0x42
-#define	G_MREAD		0x43
-#define	G_SETSAD	0x44
-#define	G_CRSWR		0x46
-#define	G_CRSRD		0x47
-#define	G_CRSMRT	0x4C
-#define	G_CRSMLT	0x4D
-#define	G_CRSMUP	0x4E
-#define	G_CRSMDN	0x4F
-#define	G_ERASE		0x52
-#define	G_SLEEP		0x53
-#define	G_DSPOFF	0x58
-#define	G_DSPON		0x59
-#define	G_HSCRL		0x5A
-#define	G_OVRLAY	0x5B
-#define	G_CGRAM		0x5C
-#define	G_CRSFRM	0x5D
+#define COM_NONE	0x00
+#define	COM_MWRITE	0x42
+#define	COM_MREAD	0x43
+#define	COM_CRSWR	0x46
+#define	COM_CRSMRT	0x4C
+#define	COM_CRSMUP	0x4E
+#define	COM_CRSMDN	0x4F
+#define	COM_DSPOFF	0x58
+#define	COM_DSPON	0x59
 
 #define TXT_W 85
@@ -294,5 +284,5 @@
 
 	switch (com) {
-	case G_MREAD:
+	case COM_MREAD:
 		if (cur >= BASE_TXT && cur < BASE_TXT + TXT_W * TXT_H) {
 			return mem_txt[cur - BASE_TXT];
@@ -313,5 +303,5 @@
 {
 	switch (com) {
-	case G_MWRITE:
+	case COM_MWRITE:
 		if (cur >= BASE_TXT && cur < BASE_TXT + TXT_W * TXT_H) {
 			mem_txt[cur - BASE_TXT] = (uint8_t)val;
@@ -325,5 +315,5 @@
 		break;
 
-	case G_CRSWR:
+	case COM_CRSWR:
 		if (n_arg == 0) {
 			cur = val;
@@ -349,37 +339,37 @@
 {
 	switch (val) {
-	case G_CRSWR:
-	case G_MREAD:
-	case G_MWRITE:
+	case COM_CRSWR:
+	case COM_MREAD:
+	case COM_MWRITE:
 		com = val;
 		break;
 
-	case G_CRSMRT:
+	case COM_CRSMRT:
 		dir = DIR_RIGHT;
-		com = G_NONE;
-		break;
-
-	case G_CRSMUP:
+		com = COM_NONE;
+		break;
+
+	case COM_CRSMUP:
 		dir = DIR_UP;
-		com = G_NONE;
-		break;
-
-	case G_CRSMDN:
+		com = COM_NONE;
+		break;
+
+	case COM_CRSMDN:
 		dir = DIR_DOWN;
-		com = G_NONE;
-		break;
-
-	case G_DSPOFF:
+		com = COM_NONE;
+		break;
+
+	case COM_DSPOFF:
 		SDL_AtomicSet(&ena, 0);
-		com = G_NONE;
-		break;
-
-	case G_DSPON:
+		com = COM_NONE;
+		break;
+
+	case COM_DSPON:
 		SDL_AtomicSet(&ena, 1);
-		com = G_NONE;
+		com = COM_NONE;
 		break;
 
 	default:
-		com = G_NONE;
+		com = COM_NONE;
 		break;
 	}