add dmx offset to hw-caps

This commit is contained in:
martii
2012-12-08 11:58:50 +01:00
parent 079d28cc86
commit 82a0c1aa10
3 changed files with 10 additions and 0 deletions

View File

@@ -33,6 +33,9 @@ typedef struct hw_caps
display_type_t display_type; display_type_t display_type;
int display_xres; /* x resolution or chars per line */ int display_xres; /* x resolution or chars per line */
int display_yres; int display_yres;
#ifdef MARTII
int dmx_offset;
#endif
char boxvendor[64]; char boxvendor[64];
char boxname[64]; char boxname[64];
} hw_caps_t; } hw_caps_t;

View File

@@ -56,6 +56,7 @@
#ifdef MARTII #ifdef MARTII
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <hardware_caps.h>
#endif #endif
#include <cstring> #include <cstring>
@@ -196,6 +197,9 @@ bool cDemux::_open(void)
{ {
/* this should not change anything... */ /* this should not change anything... */
int n = DMX_SOURCE_FRONT0 + devnum; int n = DMX_SOURCE_FRONT0 + devnum;
#ifdef MARTII
n += get_hwcaps()->dmx_offset;
#endif
lt_info("%s: setting %s to source %d\n", __func__, devname[devnum], n); lt_info("%s: setting %s to source %d\n", __func__, devname[devnum], n);
if (ioctl(fd, DMX_SET_SOURCE, &n) < 0) if (ioctl(fd, DMX_SET_SOURCE, &n) < 0)
lt_info("%s DMX_SET_SOURCE failed!\n", __func__); lt_info("%s DMX_SET_SOURCE failed!\n", __func__);

View File

@@ -68,6 +68,9 @@ hw_caps_t *get_hwcaps(void)
case 0x0c0007: case 0x0c0007:
tmp = "GoldenMedia Triplex"; tmp = "GoldenMedia Triplex";
caps.has_SCART = 1; caps.has_SCART = 1;
#ifdef MARTII
caps.dmx_offset = 1;
#endif
break; break;
default: default:
tmp = p; tmp = p;