From 9c38b59aa9f2816c1b2dce3825dcc39b187299dd Mon Sep 17 00:00:00 2001 From: martii Date: Sun, 13 Jan 2013 18:30:00 +0100 Subject: [PATCH] rename hwcap variable Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/51941092e371afc4fe70cd443987702f9d9fc186 Author: martii Date: 2013-01-13 (Sun, 13 Jan 2013) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- include/hardware_caps.h | 2 +- libspark/dmx.cpp | 2 +- libspark/hardware_caps.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/hardware_caps.h b/include/hardware_caps.h index 4904511..5cb7941 100644 --- a/include/hardware_caps.h +++ b/include/hardware_caps.h @@ -34,7 +34,7 @@ typedef struct hw_caps int display_xres; /* x resolution or chars per line */ int display_yres; #ifdef MARTII - int dmx_offset; + int fe_offset; #endif char boxvendor[64]; char boxname[64]; diff --git a/libspark/dmx.cpp b/libspark/dmx.cpp index 28bdeac..b80a200 100644 --- a/libspark/dmx.cpp +++ b/libspark/dmx.cpp @@ -198,7 +198,7 @@ bool cDemux::_open(void) /* this should not change anything... */ int n = DMX_SOURCE_FRONT0 + devnum; #ifdef MARTII - n += get_hwcaps()->dmx_offset; + n += get_hwcaps()->fe_offset; #endif lt_info("%s: setting %s to source %d\n", __func__, devname[devnum], n); if (ioctl(fd, DMX_SET_SOURCE, &n) < 0) diff --git a/libspark/hardware_caps.c b/libspark/hardware_caps.c index 166821f..c1e7918 100644 --- a/libspark/hardware_caps.c +++ b/libspark/hardware_caps.c @@ -69,7 +69,7 @@ hw_caps_t *get_hwcaps(void) tmp = "GoldenMedia Triplex"; caps.has_SCART = 1; #ifdef MARTII - caps.dmx_offset = 1; // first sat tuner + caps.fe_offset = 1; // first sat tuner #endif break; default: @@ -82,7 +82,7 @@ hw_caps_t *get_hwcaps(void) #ifdef MARTII char *fe_off = getenv("FE_OFFSET"); if (fe_off) - sscanf(fe_off, "%d", &caps.dmx_offset); + sscanf(fe_off, "%d", &caps.fe_offset); #endif fd = open (FP_DEV, O_RDWR); if (fd != -1) {