From 6463c4465405399f2d541daa3054b766f2ac2ee6 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Thu, 8 Jan 2015 12:04:23 -0600 Subject: [PATCH] auto-sync --- firmware/console/console_io.c | 8 +------- firmware/console/console_io.h | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/firmware/console/console_io.c b/firmware/console/console_io.c index 552e8f5b68..93e598eebc 100644 --- a/firmware/console/console_io.c +++ b/firmware/console/console_io.c @@ -140,10 +140,6 @@ SerialDriver * getConsoleChannel(void) { #endif } - -#endif /* EFI_PROD_CODE || EFI_EGT */ - -#if EFI_PROD_CODE bool isConsoleReady(void) { if (isSerialOverUart()) { return isSerialConsoleStarted; @@ -151,9 +147,7 @@ bool isConsoleReady(void) { return is_usb_serial_ready(); } } -#endif /* EFI_PROD_CODE */ - - +#endif /* EFI_PROD_CODE || EFI_EGT */ static THD_WORKING_AREA(consoleThreadStack, 2 * UTILITY_THREAD_STACK_SIZE); static msg_t consoleThreadThreadEntryPoint(void *arg) { diff --git a/firmware/console/console_io.h b/firmware/console/console_io.h index 55a6eb6117..38f5b19c35 100644 --- a/firmware/console/console_io.h +++ b/firmware/console/console_io.h @@ -35,7 +35,7 @@ void consoleOutputBuffer(const uint8_t *buf, int size); void startConsole(void (*console_line_callback_p)(char *)); bool isSerialOverUart(void); -#if EFI_PROD_CODE || EFI_SIMULATOR +#if EFI_PROD_CODE || EFI_SIMULATOR || EFI_EGT bool isConsoleReady(void); #else #define isConsoleReady() true