rename hwcap variable

Origin commit data
------------------
Branch: master
Commit: 51941092e3
Author: martii <m4rtii@gmx.de>
Date: 2013-01-13 (Sun, 13 Jan 2013)


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

------------------
This commit was generated by Migit
This commit is contained in:
martii
2013-01-13 18:30:00 +01:00
parent dd8d42942a
commit 9c38b59aa9
3 changed files with 4 additions and 4 deletions

View File

@@ -34,7 +34,7 @@ typedef struct hw_caps
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 #ifdef MARTII
int dmx_offset; int fe_offset;
#endif #endif
char boxvendor[64]; char boxvendor[64];
char boxname[64]; char boxname[64];

View File

@@ -198,7 +198,7 @@ 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 #ifdef MARTII
n += get_hwcaps()->dmx_offset; n += get_hwcaps()->fe_offset;
#endif #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)

View File

@@ -69,7 +69,7 @@ hw_caps_t *get_hwcaps(void)
tmp = "GoldenMedia Triplex"; tmp = "GoldenMedia Triplex";
caps.has_SCART = 1; caps.has_SCART = 1;
#ifdef MARTII #ifdef MARTII
caps.dmx_offset = 1; // first sat tuner caps.fe_offset = 1; // first sat tuner
#endif #endif
break; break;
default: default:
@@ -82,7 +82,7 @@ hw_caps_t *get_hwcaps(void)
#ifdef MARTII #ifdef MARTII
char *fe_off = getenv("FE_OFFSET"); char *fe_off = getenv("FE_OFFSET");
if (fe_off) if (fe_off)
sscanf(fe_off, "%d", &caps.dmx_offset); sscanf(fe_off, "%d", &caps.fe_offset);
#endif #endif
fd = open (FP_DEV, O_RDWR); fd = open (FP_DEV, O_RDWR);
if (fd != -1) { if (fd != -1) {