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

- formatting code using astyle

Browse Source 
Conflicts:
	libarmbox/dmx.cpp
	libgeneric-pc/video_lib.h
	libspark/dmx.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2021-05-17 23:47:39 +02:00
committed by Thilo Graf
parent 42264ba4af
commit 7e5b1fc5d2
161 changed files with 13043 additions and 11396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
libraspi/init.cpp
View File

@@ -49,24 +49,24 @@ static keymap_t kmap;
static void init_keymap(void)
{
/* same as generic-pc/glfb.cpp */
kmap[KEY_ENTER] = KEY_OK;
kmap[KEY_ESC] = KEY_EXIT;
kmap[KEY_E] = KEY_EPG;
kmap[KEY_I] = KEY_INFO;
kmap[KEY_M] = KEY_MENU;
kmap[KEY_F12] = KEY_VOLUMEUP; /* different than glfb, as we */
kmap[KEY_F11] = KEY_VOLUMEDOWN; /* don't consider the keyboard */
kmap[KEY_F10] = KEY_MUTE; /* layout... */
kmap[KEY_H] = KEY_HELP;
kmap[KEY_P] = KEY_POWER;
kmap[KEY_F1] = KEY_RED;
kmap[KEY_F2] = KEY_GREEN;
kmap[KEY_F3] = KEY_YELLOW;
kmap[KEY_F4] = KEY_BLUE;
kmap[KEY_F5] = KEY_WWW;
kmap[KEY_F6] = KEY_SUBTITLE;
kmap[KEY_F7] = KEY_MOVE;
kmap[KEY_F8] = KEY_SLEEP;
kmap[KEY_ENTER] = KEY_OK;
kmap[KEY_ESC] = KEY_EXIT;
kmap[KEY_E] = KEY_EPG;
kmap[KEY_I] = KEY_INFO;
kmap[KEY_M] = KEY_MENU;
kmap[KEY_F12] = KEY_VOLUMEUP; /* different than glfb, as we */
kmap[KEY_F11] = KEY_VOLUMEDOWN; /* don't consider the keyboard */
kmap[KEY_F10] = KEY_MUTE; /* layout... */
kmap[KEY_H] = KEY_HELP;
kmap[KEY_P] = KEY_POWER;
kmap[KEY_F1] = KEY_RED;
kmap[KEY_F2] = KEY_GREEN;
kmap[KEY_F3] = KEY_YELLOW;
kmap[KEY_F4] = KEY_BLUE;
kmap[KEY_F5] = KEY_WWW;
kmap[KEY_F6] = KEY_SUBTITLE;
kmap[KEY_F7] = KEY_MOVE;
kmap[KEY_F8] = KEY_SLEEP;
}
class Input: public OpenThreads::Thread
@@ -111,7 +111,7 @@ void Input::run()
init_keymap();
unlink("/tmp/neutrino.input");
mkfifo("/tmp/neutrino.input", 0600);
out_fd = open("/tmp/neutrino.input", O_RDWR|O_CLOEXEC|O_NONBLOCK);
out_fd = open("/tmp/neutrino.input", O_RDWR | O_CLOEXEC | O_NONBLOCK);
if (out_fd < 0)
hal_info("could not create /tmp/neutrino.input. good luck. error: %m\n");
@@ -120,16 +120,19 @@ void Input::run()
hal_info("no input devices /dev/input/eventX??\n");
else
{
while (n--) {
while (n--)
{
strcpy(inputstr + strlen("/dev/input/"), namelist[n]->d_name);
free(namelist[n]);
int fd = open(inputstr, O_RDWR|O_CLOEXEC|O_NONBLOCK);
if (fd < 0) {
int fd = open(inputstr, O_RDWR | O_CLOEXEC | O_NONBLOCK);
if (fd < 0)
{
hal_info("could not open %s:%m\n", inputstr);
continue;
}
ioctl(fd, EVIOCGBIT(0, EV_MAX), &bit);
if ((bit & (1 << EV_KEY)) == 0) {
if ((bit & (1 << EV_KEY)) == 0)
{
close(fd);
continue;
}
@@ -143,7 +146,8 @@ void Input::run()
fd_max++;
running = true;
while (running) {
while (running)
{
FD_ZERO(&rfds);
for (std::set<int>::iterator i = in_fds.begin(); i != in_fds.end(); ++i)
FD_SET((*i), &rfds);
@@ -154,18 +158,22 @@ void Input::run()
int ret = select(fd_max, &rfds, NULL, NULL, &timeout);
if (ret == 0) /* timed out */
continue;
if (ret < 0) {
if (ret < 0)
{
hal_info("input: select returned %d (%m)\n", ret);
continue;
}
for (std::set<int>::iterator i = in_fds.begin(); i != in_fds.end(); ++i) {
for (std::set<int>::iterator i = in_fds.begin(); i != in_fds.end(); ++i)
{
if (!FD_ISSET((*i), &rfds))
continue;
ret = read(*i, &in, sizeof(in));
if (ret != sizeof(in)) {
if (errno == ENODEV) {
if (ret != sizeof(in))
{
if (errno == ENODEV)
{
close(*i);
hal_info("input fd %d vanished?\n", *i);
in_fds.erase(i);
@@ -193,7 +201,8 @@ void hal_api_init()
if (!initialized)
hal_debug_init();
hal_info("%s begin, initialized=%d, debug=0x%02x\n", __func__, (int)initialized, debuglevel);
if (! glfb) {
if (! glfb)
{
int x = 1280, y = 720; /* default OSD FB resolution */
/*
* export GLFB_RESOLUTION=720,576
@@ -203,7 +212,8 @@ void hal_api_init()
const char *p = NULL;
if (tmp)
p = strchr(tmp, ',');
if (p) {
if (p)
{
x = atoi(tmp);
y = atoi(p + 1);
}