From 7496e669be53edca7fa25e56d0ccd99321841e9f Mon Sep 17 00:00:00 2001
From: mrdudz <mrdudz@users.noreply.github.com>
Date: Mon, 30 Nov 2015 18:44:04 +0100
Subject: [PATCH] fixed stuff according to Olivers review

---
 include/gamate.h     | 46 ++++++++++++++++++++++----------------------
 testcode/lib/conio.c |  2 ++
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/include/gamate.h b/include/gamate.h
index 7b1c04a81..b7c2fef7a 100644
--- a/include/gamate.h
+++ b/include/gamate.h
@@ -158,25 +158,25 @@
 #define COLOR_BLACK     0x03
 #define COLOR_WHITE     0x00
 
-#define CH_HLINE                1
-#define CH_VLINE                2
-#define CH_CROSS                3
-#define CH_ULCORNER             4
-#define CH_URCORNER             5
-#define CH_LLCORNER             6
-#define CH_LRCORNER             7
-#define CH_TTEE                 8
-#define CH_BTEE                 9
-
-#define CH_RTEE                 11
-#define CH_LTEE                 12
-
-#define CH_ENTER                13
-#define CH_PI                   18
-
-#define TV_NTSC                 0
-#define TV_PAL                  1
-#define TV_OTHER                2
+#define CH_HLINE        1
+#define CH_VLINE        2
+#define CH_CROSS        3
+#define CH_ULCORNER     4
+#define CH_URCORNER     5
+#define CH_LLCORNER     6
+#define CH_LRCORNER     7
+#define CH_TTEE         8
+#define CH_BTEE         9
+
+#define CH_RTEE         11
+#define CH_LTEE         12
+
+#define CH_ENTER        13
+#define CH_PI           18
+
+#define TV_NTSC         0
+#define TV_PAL          1
+#define TV_OTHER        2
 
 /* No support for dynamically loadable drivers */
 #define DYN_DRV         0
@@ -184,15 +184,15 @@
 /* The addresses of the static drivers */
 extern void gamate_stdjoy_joy[];   /* Referred to by joy_static_stddrv[] */
 
-#define JOY_FIRE_B              5
-#define JOY_START               6
-#define JOY_SELECT              7
+#define JOY_FIRE_B      5
+#define JOY_START       6
+#define JOY_SELECT      7
 
 void waitvblank (void);
 /* Wait for the vertical blanking */
 
 /* NOTE: all Gamate are "NTSC" */
-#define get_tv()                TV_NTSC
+#define get_tv()        TV_NTSC
 /* Return the video mode the machine is using. */
 
 /* End of gamate.h */
diff --git a/testcode/lib/conio.c b/testcode/lib/conio.c
index 2ae6b46b3..7a5e6f822 100644
--- a/testcode/lib/conio.c
+++ b/testcode/lib/conio.c
@@ -15,6 +15,7 @@
 #include <stdlib.h>
 
 #if defined(__GAMATE__)
+/* there is not enough screen space to show all 256 characters at the bottom */
 #define NUMCHARS        128
 #define NUMCOLS           4
 #else
@@ -132,6 +133,7 @@ void main(void)
                     inpos = (inpos + 1) & 7;
                 }
 #endif
+/* not all targets have waitvblank() */
 #if defined(__NES__) || defined(__PCE__) || defined(__GAMATE__)
                 waitvblank();
 #endif
-- 
2.39.5