diff --git a/src/driver/Makefile.am b/src/driver/Makefile.am index d7921afda..34f0a0e26 100644 --- a/src/driver/Makefile.am +++ b/src/driver/Makefile.am @@ -64,6 +64,10 @@ if BOXTYPE_AZBOX libneutrino_driver_a_SOURCES += \ simple_display.cpp endif +if BOXTYPE_GENERIC +libneutrino_driver_a_SOURCES += \ + simple_display.cpp +endif if USE_STB_HAL INCLUDES += \ -I$(STB_HAL_INC) \ diff --git a/src/driver/simple_display.cpp b/src/driver/simple_display.cpp index 3702bc69d..4bcfb4b0a 100644 --- a/src/driver/simple_display.cpp +++ b/src/driver/simple_display.cpp @@ -42,6 +42,9 @@ #define DISPLAY_DEV "/proc/vfd" #define LED_DEV "/proc/led" #endif +#if HAVE_GENERIC_HARDWARE +#define DISPLAY_DEV "/dev/null" +#endif static char volume = 0; //static char percent = 0; @@ -436,8 +439,7 @@ void CLCD::Clear() close(fd); printf("spark_led:%s\n", __func__); } -#endif -#if HAVE_AZBOX_HARDWARE +#else void CLCD::Clear() { display(" ", false); diff --git a/src/global.h b/src/global.h index 9f9fe3399..bea35a8cd 100644 --- a/src/global.h +++ b/src/global.h @@ -41,7 +41,7 @@ #if HAVE_COOL_HARDWARE #include #endif -#if HAVE_TRIPLEDRAGON || HAVE_SPARK_HARDWARE || HAVE_AZBOX_HARDWARE +#if HAVE_TRIPLEDRAGON || HAVE_SPARK_HARDWARE || HAVE_AZBOX_HARDWARE || HAVE_GENERIC_HARDWARE #include "driver/lcdd.h" #define CVFD CLCD #endif diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp index df2f87d15..4588c45ef 100644 --- a/src/gui/videosettings.cpp +++ b/src/gui/videosettings.cpp @@ -194,6 +194,14 @@ CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_O }; #endif +/* dummy entry, for generic hardware */ +#if VIDEOMENU_VIDEOMODE_OPTION_COUNT == 1 +CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_OPTION_COUNT] = +{ + { VIDEO_STD_PAL, NONEXISTANT_LOCALE, "PAL" } +}; +#endif + #if HAVE_TRIPLEDRAGON #define VIDEOMENU_VIDEOFORMAT_OPTION_COUNT 2 #else diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 896a60d8e..37f2daa01 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -308,7 +308,7 @@ const lcd_setting_struct_t lcd_setting[SNeutrinoSettings::LCD_SETTING_COUNT] = /************************************************************************************** * CNeutrinoApp - loadSetup, load the application-settings * **************************************************************************************/ -#if HAVE_TRIPLEDRAGON || HAVE_SPARK_HARDWARE +#if HAVE_TRIPLEDRAGON || HAVE_SPARK_HARDWARE || HAVE_GENERIC_HARDWARE #define DEFAULT_X_START_SD 32 #define DEFAULT_Y_START_SD 26 #define DEFAULT_X_END_SD 694 @@ -325,6 +325,12 @@ const lcd_setting_struct_t lcd_setting[SNeutrinoSettings::LCD_SETTING_COUNT] = #define DEFAULT_X_END_HD 1235 //1275 #define DEFAULT_Y_END_HD 690 //715 +#if HAVE_GENERIC_HARDWARE +#define DEFAULT_SCREEN_PRESET 0 +#else +#define DEFAULT_SCREEN_PRESET 1 +#endif + std::string ttx_font_file = ""; int CNeutrinoApp::loadSetup(const char * fname) @@ -658,7 +664,7 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.screen_StartY_lcd = configfile.getInt32( "screen_StartY_lcd", DEFAULT_Y_START_HD ); g_settings.screen_EndX_lcd = configfile.getInt32( "screen_EndX_lcd", DEFAULT_X_END_HD); g_settings.screen_EndY_lcd = configfile.getInt32( "screen_EndY_lcd", DEFAULT_Y_END_HD); - g_settings.screen_preset = configfile.getInt32( "screen_preset", 1); + g_settings.screen_preset = configfile.getInt32( "screen_preset", DEFAULT_SCREEN_PRESET); #if HAVE_TRIPLEDRAGON g_settings.screen_preset = 0; /* does not make sense to have two configurations for that... */ diff --git a/src/system/settings.h b/src/system/settings.h index eef03bce9..8888c16c1 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -56,6 +56,9 @@ #if HAVE_AZBOX_HARDWARE #define VIDEOMENU_VIDEOMODE_OPTION_COUNT 9 #endif +#ifndef VIDEOMENU_VIDEOMODE_OPTION_COUNT +#define VIDEOMENU_VIDEOMODE_OPTION_COUNT 1 +#endif struct SNeutrinoSettings {