Merge branch 'master' of bitbucket.org:neutrino-images/ni-libstb-hal-next

Origin commit data
------------------
Branch: master
Commit: 8b49c10417
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-11-13 (Mon, 13 Nov 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
gixxpunk
2017-11-13 18:02:09 +01:00
9 changed files with 49 additions and 26 deletions

View File

@@ -31,6 +31,7 @@ hw_caps_t *get_hwcaps(void)
caps.has_HDMI = 1;
caps.display_xres = 8;
caps.display_can_deepstandby = 0;
caps.display_has_statusline = 0;
strcpy(caps.boxvendor, "AZBox");
const char *tmp;
char buf[64];

View File

@@ -122,10 +122,15 @@ void GLFramebuffer::initKeys()
mSpecialMap[GLUT_KEY_F3] = KEY_YELLOW;
mSpecialMap[GLUT_KEY_F4] = KEY_BLUE;
mSpecialMap[GLUT_KEY_F5] = KEY_PLAY;
mSpecialMap[GLUT_KEY_F6] = KEY_STOP;
mSpecialMap[GLUT_KEY_F7] = KEY_FORWARD;
mSpecialMap[GLUT_KEY_F8] = KEY_REWIND;
mSpecialMap[GLUT_KEY_F5] = KEY_RECORD;
mSpecialMap[GLUT_KEY_F6] = KEY_PLAY;
mSpecialMap[GLUT_KEY_F7] = KEY_PAUSE;
mSpecialMap[GLUT_KEY_F8] = KEY_STOP;
mSpecialMap[GLUT_KEY_F9] = KEY_FORWARD;
mSpecialMap[GLUT_KEY_F10] = KEY_REWIND;
mSpecialMap[GLUT_KEY_F11] = KEY_NEXT;
mSpecialMap[GLUT_KEY_F12] = KEY_PREVIOUS;
mSpecialMap[GLUT_KEY_F9] = KEY_RECORD;
mSpecialMap[GLUT_KEY_F10] = KEY_PAUSE;
@@ -138,15 +143,6 @@ void GLFramebuffer::initKeys()
mKeyMap[0x0d] = KEY_OK;
mKeyMap[0x1b] = KEY_EXIT;
mKeyMap['e'] = KEY_EPG;
mKeyMap['i'] = KEY_INFO;
mKeyMap['m'] = KEY_MENU;
mKeyMap['+'] = KEY_VOLUMEUP;
mKeyMap['-'] = KEY_VOLUMEDOWN;
mKeyMap['.'] = KEY_MUTE;
mKeyMap['h'] = KEY_HELP;
mKeyMap['p'] = KEY_POWER;
mKeyMap['0'] = KEY_0;
mKeyMap['1'] = KEY_1;
@@ -159,10 +155,29 @@ void GLFramebuffer::initKeys()
mKeyMap['8'] = KEY_8;
mKeyMap['9'] = KEY_9;
mKeyMap['r'] = KEY_RED;
mKeyMap['g'] = KEY_GREEN;
mKeyMap['y'] = KEY_YELLOW;
mKeyMap['b'] = KEY_BLUE;
mKeyMap['+'] = KEY_VOLUMEUP;
mKeyMap['-'] = KEY_VOLUMEDOWN;
mKeyMap['.'] = KEY_MUTE;
mKeyMap['a'] = KEY_AUDIO;
mKeyMap['e'] = KEY_EPG;
// ['f'] is reserved to toggle fullscreen;
mKeyMap['g'] = KEY_GAMES;
mKeyMap['h'] = KEY_HELP;
mKeyMap['i'] = KEY_INFO;
mKeyMap['m'] = KEY_MENU;
mKeyMap['p'] = KEY_POWER;
mKeyMap['r'] = KEY_RADIO;
mKeyMap['s'] = KEY_SUBTITLE;
mKeyMap['t'] = KEY_TV;
mKeyMap['v'] = KEY_VIDEO;
mKeyMap['z'] = KEY_SLEEP;
/* shift keys */
mKeyMap['F'] = KEY_FAVORITES;
mKeyMap['M'] = KEY_MODE;
mKeyMap['S'] = KEY_SAT;
mKeyMap['T'] = KEY_TEXT;
mKeyMap['W'] = KEY_WWW;
}
void GLFramebuffer::run()

View File

@@ -33,6 +33,7 @@ hw_caps_t *get_hwcaps(void)
caps.has_HDMI = 1;
caps.display_xres = 8;
caps.display_can_deepstandby = 0;
caps.display_has_statusline = 0;
strcpy(caps.boxvendor, "Generic");
strcpy(caps.boxname, "PC");
if (! uname(&u))

View File

@@ -38,6 +38,7 @@ typedef struct hw_caps
int display_yres;
int display_can_set_brightness;
int display_can_deepstandby;
int display_has_statusline;
char boxvendor[64];
char boxname[64];
char boxarch[64];

View File

@@ -36,6 +36,7 @@ hw_caps_t *get_hwcaps(void)
caps.display_type = HW_DISPLAY_LINE_TEXT;
caps.display_can_deepstandby = 0;
caps.display_can_set_brightness = 1;
caps.display_has_statusline = 0;
caps.has_HDMI = 1;
strcpy(caps.boxvendor, "AX-Technologies");
strcpy(caps.boxname, "HD51");

View File

@@ -31,6 +31,7 @@ hw_caps_t *get_hwcaps(void)
int fd = open("/proc/stb/info/model", O_RDONLY);
caps.display_can_set_brightness = 0;
caps.display_can_deepstandby = 0;
caps.display_has_statusline = 0;
if (fd != -1) {
len = read(fd, buf, sizeof(buf) - 1);
close(fd);

View File

@@ -36,6 +36,7 @@ hw_caps_t *get_hwcaps(void)
caps.display_type = HW_DISPLAY_LED_NUM;
caps.display_can_set_brightness = 0;
caps.display_can_deepstandby = 0;
caps.display_has_statusline = 0;
caps.has_HDMI = 1;
caps.has_SCART = 1;
caps.display_xres = 4;

View File

@@ -21,6 +21,7 @@ static hw_caps_t caps = {
.display_xres = 128,
.display_yres = 64,
.display_can_deepstandby = 0;
.display_has_statusline = 0;
.boxvendor = "Armas",
.boxname = "TripleDragon"
};

View File

@@ -31,6 +31,7 @@ hw_caps_t *get_hwcaps(void)
caps.has_HDMI = 1;
caps.display_xres = 8;
caps.display_can_deepstandby = 0;
caps.display_has_statusline = 0;
strcpy(caps.boxvendor, "Raspberry");
strcpy(caps.boxname, "Pi");