diff --git a/include/hardware_caps.h b/include/hardware_caps.h index f37b34d..5966056 100644 --- a/include/hardware_caps.h +++ b/include/hardware_caps.h @@ -33,10 +33,6 @@ typedef struct hw_caps display_type_t display_type; int display_xres; /* x resolution or chars per line */ int display_yres; -#ifdef MARTII - int fe_offset; - int fe_offset_max; -#endif char boxvendor[64]; char boxname[64]; } hw_caps_t; diff --git a/libspark/dmx.cpp b/libspark/dmx.cpp index b80a200..edc96d3 100644 --- a/libspark/dmx.cpp +++ b/libspark/dmx.cpp @@ -197,9 +197,6 @@ bool cDemux::_open(void) { /* this should not change anything... */ int n = DMX_SOURCE_FRONT0 + devnum; -#ifdef MARTII - 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) lt_info("%s DMX_SET_SOURCE failed!\n", __func__); diff --git a/libspark/hardware_caps.c b/libspark/hardware_caps.c index 032d8a7..e419ac3 100644 --- a/libspark/hardware_caps.c +++ b/libspark/hardware_caps.c @@ -71,10 +71,6 @@ hw_caps_t *get_hwcaps(void) case 0x0c0007: tmp = "GoldenMedia Triplex"; caps.has_SCART = 1; -#ifdef MARTII - caps.fe_offset = 1; // first sat tuner - caps.fe_offset_max = 2; // last tuner -#endif break; default: tmp = p; @@ -83,11 +79,6 @@ hw_caps_t *get_hwcaps(void) tmp = "(NO STB_ID FOUND)"; strcpy(caps.boxname, tmp); } -#ifdef MARTII - char *fe_off = getenv("FE_OFFSET"); - if (fe_off) - sscanf(fe_off, "%d", &caps.fe_offset); -#endif fd = open (FP_DEV, O_RDWR); if (fd != -1) { ret = ioctl(fd, VFDGETVERSION, &val);