mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 15:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix build for boxtype "generic"

Browse Source
This commit is contained in:
Stefan Seyfried
2012-10-06 18:11:20 +02:00
parent d806eeb544
commit 0061aac2b3
6 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/driver/Makefile.am
View File

@@ -64,6 +64,10 @@ if BOXTYPE_AZBOX
libneutrino_driver_a_SOURCES += \ libneutrino_driver_a_SOURCES += \
simple_display.cpp simple_display.cpp
endif endif
if BOXTYPE_GENERIC
libneutrino_driver_a_SOURCES += \
simple_display.cpp
endif
if USE_STB_HAL if USE_STB_HAL
INCLUDES += \ INCLUDES += \
-I$(STB_HAL_INC) \ -I$(STB_HAL_INC) \

6
src/driver/simple_display.cpp
View File

@@ -42,6 +42,9 @@
#define DISPLAY_DEV "/proc/vfd" #define DISPLAY_DEV "/proc/vfd"
#define LED_DEV "/proc/led" #define LED_DEV "/proc/led"
#endif #endif
#if HAVE_GENERIC_HARDWARE
#define DISPLAY_DEV "/dev/null"
#endif
static char volume = 0; static char volume = 0;
//static char percent = 0; //static char percent = 0;
@@ -436,8 +439,7 @@ void CLCD::Clear()
close(fd); close(fd);
printf("spark_led:%s\n", __func__); printf("spark_led:%s\n", __func__);
} }
#endif #else
#if HAVE_AZBOX_HARDWARE
void CLCD::Clear() void CLCD::Clear()
{ {
display(" ", false); display(" ", false);

2
src/global.h
View File

@@ -41,7 +41,7 @@
#if HAVE_COOL_HARDWARE #if HAVE_COOL_HARDWARE
#include <driver/vfd.h> #include <driver/vfd.h>
#endif #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" #include "driver/lcdd.h"
#define CVFD CLCD #define CVFD CLCD
#endif #endif

8
src/gui/videosettings.cpp
View File

@@ -194,6 +194,14 @@ CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_O
}; };
#endif #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 #if HAVE_TRIPLEDRAGON
#define VIDEOMENU_VIDEOFORMAT_OPTION_COUNT 2 #define VIDEOMENU_VIDEOFORMAT_OPTION_COUNT 2
#else #else

10
src/neutrino.cpp
View File

@@ -308,7 +308,7 @@ const lcd_setting_struct_t lcd_setting[SNeutrinoSettings::LCD_SETTING_COUNT] =
/************************************************************************************** /**************************************************************************************
* CNeutrinoApp - loadSetup, load the application-settings * * 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_X_START_SD 32
#define DEFAULT_Y_START_SD 26 #define DEFAULT_Y_START_SD 26
#define DEFAULT_X_END_SD 694 #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_X_END_HD 1235 //1275
#define DEFAULT_Y_END_HD 690 //715 #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 = ""; std::string ttx_font_file = "";
int CNeutrinoApp::loadSetup(const char * fname) 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_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_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_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 #if HAVE_TRIPLEDRAGON
g_settings.screen_preset = 0; /* does not make sense to have two configurations for that... */ g_settings.screen_preset = 0; /* does not make sense to have two configurations for that... */

3
src/system/settings.h
View File

@@ -56,6 +56,9 @@
#if HAVE_AZBOX_HARDWARE #if HAVE_AZBOX_HARDWARE
#define VIDEOMENU_VIDEOMODE_OPTION_COUNT 9 #define VIDEOMENU_VIDEOMODE_OPTION_COUNT 9
#endif #endif
#ifndef VIDEOMENU_VIDEOMODE_OPTION_COUNT
#define VIDEOMENU_VIDEOMODE_OPTION_COUNT 1
#endif
struct SNeutrinoSettings struct SNeutrinoSettings
{ {