diff --git a/Makefile b/Makefile index 28c954a..704d890 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ dep: install: all $(MAKE) -C $(KDIR) KBUILD_EXTMOD=$(PWD) modules_install - depmod -a + depmod $(kernelver) clean: rm -rf */.*.o.d */*.o */*.ko */*.mod.c */.*.cmd .tmp_versions Module* modules* diff --git a/apps/ddinfo.c b/apps/ddinfo.c index 5cbe77a..e654365 100644 --- a/apps/ddinfo.c +++ b/apps/ddinfo.c @@ -30,6 +30,21 @@ char *Rolloff[8] = { "rsvd", }; +void dump(const uint8_t *b, int l) +{ + int i, j; + + for (j = 0; j < l; j += 16, b += 16) { + printf("%04x: ", j); + for (i = 0; i < 16; i++) + if (i + j < l) + printf("%02x ", b[i]); + else + printf(" "); + printf("\n"); + } +} + void print_temp(struct mci_result *res) { printf("Die temperature = %u\n", res->sx8_bist.temperature); @@ -55,6 +70,9 @@ int temp_info(int dev, uint32_t link) } print_temp(&msg.res); + printf("BIST info dump: "); + dump((uint8_t *) &msg.res, 16); + return ret; } @@ -231,8 +249,9 @@ void print_info(struct mci_result *res, uint8_t demod) printf("\nDemod %u:\n", demod); if (res->status == MCI_DEMOD_LOCKED) { switch (res->mode) { + case 0: case M4_MODE_DVBSX: - if (res->dvbs2_signal_info.standard == 2) { + if (res->dvbs2_signal_info.standard != 1) { int short_frame = 0, pilots = 0; char *modcod = "unknown"; uint8_t pls = res->dvbs2_signal_info.pls_code; @@ -256,13 +275,14 @@ void print_info(struct mci_result *res, uint8_t demod) } printf("Roll-Off: %s\n", Rolloff[res->dvbs2_signal_info.roll_off & 7]); printf("Pilots: %s\n", pilots ? "On" : "Off"); - printf("Frame: %s\n", short_frame ? "Short" : "Long"); + printf("Frame: %s\n", short_frame ? "Short" : "Normal"); } else { printf("Demod Locked: DVB-S\n"); printf("PR: %s\n", PunctureRates[res->dvbs2_signal_info.pls_code & 0x07]); } printf("Inversion: %s\n", (res->dvbs2_signal_info.roll_off & 0x80) ? "on": "off"); + break; case M4_MODE_DVBT: printf("Locked DVB-T\n"); break; diff --git a/include/linux/media/dvbdev.h b/include/linux/media/dvbdev.h index c4005df..4d3ab9f 100644 --- a/include/linux/media/dvbdev.h +++ b/include/linux/media/dvbdev.h @@ -27,11 +27,15 @@ #define DVB_MAJOR 212 +#if 0 #if defined(CONFIG_DVB_MAX_ADAPTERS) && CONFIG_DVB_MAX_ADAPTERS > 0 #define DVB_MAX_ADAPTERS CONFIG_DVB_MAX_ADAPTERS #else #define DVB_MAX_ADAPTERS 64 #endif +#endif + + #define DVB_MAX_ADAPTERS 64 #define DVB_UNSET (-1) diff --git a/lib/config/dddvb.conf b/lib/config/dddvb.conf index 3352c81..cb27303 100644 --- a/lib/config/dddvb.conf +++ b/lib/config/dddvb.conf @@ -17,3 +17,7 @@ Tuner5=5,984 Tuner6=6,1020 Tuner7=7,1056 Tuner8=8,1092 +Tuner9=1,1210 +Tuner10=2,1420 +Tuner11=3,1680 +Tuner12=4,2040