From a796a9f14c285dc5f7e29145d5e59b055b0ffed1 Mon Sep 17 00:00:00 2001 From: Aaron Culliney Date: Sun, 31 May 2015 12:57:33 -0700 Subject: [PATCH] c_mygetch is strictly INTERFACE_CLASSIC --- src/keys.c | 2 +- src/meta/debugger.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/keys.c b/src/keys.c index 5d83557b..22667ed1 100644 --- a/src/keys.c +++ b/src/keys.c @@ -439,6 +439,7 @@ int c_rawkey() return last_scancode; } +#ifdef INTERFACE_CLASSIC int c_mygetch(int block) { int retval; @@ -458,7 +459,6 @@ int c_mygetch(int block) return retval; } -#ifdef INTERFACE_CLASSIC void c_keys_set_key(int key) { next_key = key; diff --git a/src/meta/debugger.c b/src/meta/debugger.c index f721244f..53fd88bf 100644 --- a/src/meta/debugger.c +++ b/src/meta/debugger.c @@ -1115,9 +1115,11 @@ void fb_sha1() { LOG("SHA1 : %s", buf); int ch = -1; +#ifdef INTERFACE_CLASSIC while ((ch = c_mygetch(1)) == -1) { // ... } +#endif clear_debugger_screen(); sprintf(second_buf[num_buffer_lines++], "%s", buf); @@ -1172,7 +1174,7 @@ static int begin_cpu_stepping() { #warning FIXME TODO : this is mis-named now ... GLVideo pushes sync state so we do not need to force poll ... but we need this to type the testing strings ... should refactor to leverage a common codepath, preferablly using the 'typing' mechanism here... extern void testing_video_sync(); testing_video_sync(); -#else +#elif defined(INTERFACE_CLASSIC) if ((ch = c_mygetch(0)) != -1) { break; }