frodovdr
/
dddvb
mirror of https://github.com/DigitalDevices/dddvb.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'internal'

This commit is contained in:
rjkm 2021-08-20 14:36:46 +02:00
parent fbc39f71f4 eeb013e0fa
commit 8986494cd3
4 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -27,7 +27,7 @@ dep:
install: all install: all
$(MAKE) -C $(KDIR) KBUILD_EXTMOD=$(PWD) modules_install $(MAKE) -C $(KDIR) KBUILD_EXTMOD=$(PWD) modules_install
depmod -a depmod $(kernelver)
clean: clean:
rm -rf */.*.o.d */*.o */*.ko */*.mod.c */.*.cmd .tmp_versions Module* modules* rm -rf */.*.o.d */*.o */*.ko */*.mod.c */.*.cmd .tmp_versions Module* modules*

24
apps/ddinfo.c
View File

@ -30,6 +30,21 @@ char *Rolloff[8] = {
"rsvd", "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) void print_temp(struct mci_result *res)
{ {
printf("Die temperature = %u\n", res->sx8_bist.temperature); 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); print_temp(&msg.res);
printf("BIST info dump: ");
dump((uint8_t *) &msg.res, 16);
return ret; return ret;
} }
@ -231,8 +249,9 @@ void print_info(struct mci_result *res, uint8_t demod)
printf("\nDemod %u:\n", demod); printf("\nDemod %u:\n", demod);
if (res->status == MCI_DEMOD_LOCKED) { if (res->status == MCI_DEMOD_LOCKED) {
switch (res->mode) { switch (res->mode) {
case 0:
case M4_MODE_DVBSX: case M4_MODE_DVBSX:
if (res->dvbs2_signal_info.standard == 2) { if (res->dvbs2_signal_info.standard != 1) {
int short_frame = 0, pilots = 0; int short_frame = 0, pilots = 0;
char *modcod = "unknown"; char *modcod = "unknown";
uint8_t pls = res->dvbs2_signal_info.pls_code; 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("Roll-Off: %s\n", Rolloff[res->dvbs2_signal_info.roll_off & 7]);
printf("Pilots: %s\n", pilots ? "On" : "Off"); printf("Pilots: %s\n", pilots ? "On" : "Off");
printf("Frame: %s\n", short_frame ? "Short" : "Long"); printf("Frame: %s\n", short_frame ? "Short" : "Normal");
} else { } else {
printf("Demod Locked: DVB-S\n"); printf("Demod Locked: DVB-S\n");
printf("PR: %s\n", printf("PR: %s\n",
PunctureRates[res->dvbs2_signal_info.pls_code & 0x07]); PunctureRates[res->dvbs2_signal_info.pls_code & 0x07]);
} }
printf("Inversion: %s\n", (res->dvbs2_signal_info.roll_off & 0x80) ? "on": "off"); printf("Inversion: %s\n", (res->dvbs2_signal_info.roll_off & 0x80) ? "on": "off");
break;
case M4_MODE_DVBT: case M4_MODE_DVBT:
printf("Locked DVB-T\n"); printf("Locked DVB-T\n");
break; break;

4
include/linux/media/dvbdev.h
View File

@ -27,11 +27,15 @@
#define DVB_MAJOR 212 #define DVB_MAJOR 212
#if 0
#if defined(CONFIG_DVB_MAX_ADAPTERS) && CONFIG_DVB_MAX_ADAPTERS > 0 #if defined(CONFIG_DVB_MAX_ADAPTERS) && CONFIG_DVB_MAX_ADAPTERS > 0
#define DVB_MAX_ADAPTERS CONFIG_DVB_MAX_ADAPTERS #define DVB_MAX_ADAPTERS CONFIG_DVB_MAX_ADAPTERS
#else #else
#define DVB_MAX_ADAPTERS 64 #define DVB_MAX_ADAPTERS 64
#endif #endif
#endif
#define DVB_MAX_ADAPTERS 64
#define DVB_UNSET (-1) #define DVB_UNSET (-1)

4
lib/config/dddvb.conf
View File

@ -17,3 +17,7 @@ Tuner5=5,984
Tuner6=6,1020 Tuner6=6,1020
Tuner7=7,1056 Tuner7=7,1056
Tuner8=8,1092 Tuner8=8,1092
Tuner9=1,1210
Tuner10=2,1420
Tuner11=3,1680
Tuner12=4,2040