frodovdr/dddvb
1
0
Fork 0
mirror of https://github.com/DigitalDevices/dddvb.git synced 2023-10-10 13:37:43 +02:00
Code Issues Releases Wiki Activity

Added FEC and Modulation type for DVB-S2X (Specified in ETSI EN 302 307-2)

Browse Source
This commit is contained in:
sorenhede 2019-06-13 22:18:19 +02:00
parent 040a1c58b6
commit ccc7069122
4 changed files with 134 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/Makefile
View File

@ -1,4 +1,4 @@
all: cit citin flashprog modt ddtest setmod ddflash setmod2 pls setmod3 all: cit citin flashprog modt ddtest setmod ddflash setmod2 pls setmod3 modcod
cit: cit.c cit: cit.c
$(CC) -o cit cit.c -lpthread $(CC) -o cit cit.c -lpthread
@ -15,6 +15,9 @@ setmod2: setmod2.c
setmod3: setmod3.c setmod3: setmod3.c
$(CC) -o setmod3 setmod3.c -I../include/ $(CC) -o setmod3 setmod3.c -I../include/
modcod: modcod.c
$(CC) -o modcod modcod.c -I../include/
%.o: %.c %.o: %.c
$(CC) $(CFLAGS) -o $@ $< $(CC) $(CFLAGS) -o $@ $<

61
apps/modcod.c Normal file
View File

@ -0,0 +1,61 @@
#include <stdio.h>
#include <ctype.h>
#include <string.h>
#include <unistd.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <stdint.h>
#include <stdlib.h>
#include <fcntl.h>
#include <sys/ioctl.h>
#include <pthread.h>
#include <linux/dvb/mod.h>
int main()
{
const enum fe_modulation modcod2modS2X[0x3D] = {
MODULATION_NONE, MODULATION_NONE, //2
QPSK, QPSK, QPSK, //3
APSK_8, APSK_8,APSK_8,APSK_8,APSK_8, //5
APSK_16,APSK_16,APSK_16,APSK_16,APSK_16,APSK_16,APSK_16,APSK_16,APSK_16,APSK_16,APSK_16,APSK_16,APSK_16,//13
APSK_32,MODULATION_NONE,APSK_32,APSK_32,APSK_32,//5
APSK_64, APSK_64, MODULATION_NONE, APSK_64,MODULATION_NONE, APSK_64,MODULATION_NONE ,APSK_64,//8
APSK_128, APSK_128,
APSK_256, APSK_256,APSK_256,APSK_256,APSK_256,APSK_256,
QPSK, QPSK,QPSK,QPSK,QPSK,QPSK,
PSK_8,PSK_8,PSK_8,PSK_8,
APSK_16,APSK_16,APSK_16,APSK_16,APSK_16,
APSK_32,APSK_32,
};
const enum fe_code_rate modcod2fecS2X[0x3D] = {
FEC_NONE, FEC_NONE, //2
FEC_13_45, FEC_9_20, FEC_11_20, //3
FEC_5_9_L, FEC_26_45_L, FEC_23_36, FEC_25_36, FEC_13_18, //5
FEC_1_2_L, FEC_8_15_L, FEC_5_9_L, FEC_26_45, FEC_3_5, FEC_3_5_L, FEC_28_45, FEC_23_36,FEC_2_3_L, FEC_25_36, FEC_13_18,FEC_7_9, FEC_77_90, //13
FEC_2_3_L, FEC_NONE, FEC_32_45, FEC_11_15, FEC_7_9,
FEC_32_45_L, FEC_11_15,FEC_NONE ,FEC_7_9, FEC_NONE, FEC_4_5, FEC_NONE, FEC_5_6, //8
FEC_3_4,FEC_7_9, FEC_29_45_L,FEC_2_3_L,FEC_31_45_L,FEC_32_45,FEC_11_15_L,
FEC_3_4,FEC_11_45,FEC_4_15,FEC_14_45,FEC_7_15,FEC_8_15,
FEC_32_45,FEC_7_15,FEC_8_15,FEC_26_45,FEC_32_45,FEC_7_15,
FEC_8_15,FEC_26_45,FEC_3_5,FEC_32_45,FEC_2_3,FEC_32_45,
};
uint8_t modcod;
modcod = 248;
if(modcod2modS2X[((modcod & 0x7F) >> 1)] == APSK_32)
printf("modcod2modS2X OK\r\n");
if(modcod2fecS2X[((modcod & 0x7F) >> 1)] == FEC_32_45)
printf("modcod2modS2X OK\r\n");
modcod = 132;
if(modcod2modS2X[((modcod & 0x7F) >> 1)] == QPSK)
printf("modcod2modS2X OK\r\n");
if(modcod2fecS2X[((modcod & 0x7F) >> 1)] == FEC_13_45)
printf("modcod2modS2X OK\r\n");
//printf("test mod=%u value= %d APSK_32=%d \n",mod, modcod2modS2X[((mod & 0x7F) >> 1)], APSK_32);
//printf("test mod=%u value= %d FEC_32_45=%d \n",mod, modcod2fecS2X[((mod & 0x7F) >> 1)], FEC_32_45);
}

38
ddbridge/ddbridge-mci.c
View File

@ -229,6 +229,35 @@ void ddb_mci_proc_info(struct mci *mci, struct dtv_frontend_properties *p)
ROLLOFF_5, ROLLOFF_15, ROLLOFF_35, ROLLOFF_35 ROLLOFF_5, ROLLOFF_15, ROLLOFF_35, ROLLOFF_35
}; };
const enum fe_modulation modcod2modS2X[0x3D] = {
MODULATION_NONE, MODULATION_NONE, //2
QPSK, QPSK, QPSK, //3
APSK_8, APSK_8,APSK_8,APSK_8,APSK_8, //5
APSK_16,APSK_16,APSK_16,APSK_16,APSK_16,APSK_16,APSK_16,APSK_16,APSK_16,APSK_16,APSK_16,APSK_16,APSK_16,//13
APSK_32,MODULATION_NONE,APSK_32,APSK_32,APSK_32,//5
APSK_64, APSK_64, MODULATION_NONE, APSK_64,MODULATION_NONE, APSK_64,MODULATION_NONE ,APSK_64,//8
APSK_128, APSK_128,
APSK_256, APSK_256,APSK_256,APSK_256,APSK_256,APSK_256,
QPSK, QPSK,QPSK,QPSK,QPSK,QPSK,
PSK_8,PSK_8,PSK_8,PSK_8,
APSK_16,APSK_16,APSK_16,APSK_16,APSK_16,
APSK_32,APSK_32,
};
const enum fe_code_rate modcod2fecS2X[0x3D] = {
FEC_NONE, FEC_NONE, //2
FEC_13_45, FEC_9_20, FEC_11_20, //3
FEC_5_9_L, FEC_26_45_L, FEC_23_36, FEC_25_36, FEC_13_18, //5
FEC_1_2_L, FEC_8_15_L, FEC_5_9_L, FEC_26_45, FEC_3_5, FEC_3_5_L, FEC_28_45, FEC_23_36,FEC_2_3_L, FEC_25_36, FEC_13_18,FEC_7_9, FEC_77_90, //13
FEC_2_3_L, FEC_NONE, FEC_32_45, FEC_11_15, FEC_7_9,
FEC_32_45_L, FEC_11_15,FEC_NONE ,FEC_7_9, FEC_NONE, FEC_4_5, FEC_NONE, FEC_5_6, //8
FEC_3_4,FEC_7_9, FEC_29_45_L,FEC_2_3_L,FEC_31_45_L,FEC_32_45,FEC_11_15_L,
FEC_3_4,FEC_11_45,FEC_4_15,FEC_14_45,FEC_7_15,FEC_8_15,
FEC_32_45,FEC_7_15,FEC_8_15,FEC_26_45,FEC_32_45,FEC_7_15,
FEC_8_15,FEC_26_45,FEC_3_5,FEC_32_45,FEC_2_3,FEC_32_45,
};
p->frequency = p->frequency =
mci->signal_info.dvbs2_signal_info.frequency; mci->signal_info.dvbs2_signal_info.frequency;
switch (p->delivery_system) { switch (p->delivery_system) {
@ -252,8 +281,17 @@ void ddb_mci_proc_info(struct mci *mci, struct dtv_frontend_properties *p)
ro_lut[mci->signal_info. ro_lut[mci->signal_info.
dvbs2_signal_info.roll_off & 7]; dvbs2_signal_info.roll_off & 7];
p->pilot = (pls_code & 1) ? PILOT_ON : PILOT_OFF; p->pilot = (pls_code & 1) ? PILOT_ON : PILOT_OFF;
if(modcod & 0x80) //DVB-S2X
{
uint8_t modcodS2X = (modcod & 0x7F) >> 1;
p->fec_inner = modcod2fecS2X[modcodS2X];
p->modulation = modcod2modS2X[modcodS2X];
}
else
{
p->fec_inner = modcod2fec[modcod]; p->fec_inner = modcod2fec[modcod];
p->modulation = modcod2mod[modcod]; p->modulation = modcod2mod[modcod];
}
p->transmission_mode = pls_code; p->transmission_mode = pls_code;
} else { } else {
p->delivery_system = SYS_DVBS; p->delivery_system = SYS_DVBS;

29
include/linux/dvb/frontend.h
View File

@ -314,6 +314,33 @@ enum fe_code_rate {
FEC_2_5, FEC_2_5,
FEC_1_4, FEC_1_4,
FEC_1_3, FEC_1_3,
FEC_13_45,
FEC_9_20,
FEC_11_20,
FEC_5_9_L,
FEC_26_45_L,
FEC_23_36,
FEC_25_36,
FEC_13_18,
FEC_1_2_L,
FEC_8_15_L,
FEC_26_45,
FEC_3_5_L,
FEC_28_45,
FEC_2_3_L,
FEC_7_9,
FEC_32_45_L,
FEC_77_90,
FEC_32_45,
FEC_11_15,
FEC_29_45_L,
FEC_31_45_L,
FEC_11_15_L,
FEC_11_45,
FEC_4_15,
FEC_14_45,
FEC_7_15,
FEC_8_15,
}; };
/** /**
@ -354,6 +381,8 @@ enum fe_modulation {
APSK_64, APSK_64,
APSK_128, APSK_128,
APSK_256, APSK_256,
APSK_8,
MODULATION_NONE,
}; };
/** /**