Merge branch 'internal'

2025-03-01 10:35:23 +00:00 · 2022-03-22 15:23:26 +01:00 · 2022-03-21 17:40:59 +01:00 · 2022-02-20 23:22:36 +01:00 · 2022-02-16 15:55:04 +01:00 · 2021-12-06 15:15:18 +01:00
57 changed files with 1417 additions and 2438 deletions
--- a/4
+++ b/4
@@ -1,5 +1,4 @@
 kernelver ?= $(shell uname -r)
-MDIR	?=
 KDIR	?= /lib/modules/$(kernelver)/build
 PWD	:= $(shell pwd)

@@ -30,11 +29,10 @@ dep:
 	DIR=`pwd`; (cd $(TOPDIR); make KBUILD_EXTMOD=$$DIR dep)

 install: all
-	$(MAKE) -C $(KDIR) KBUILD_EXTMOD=$(PWD) INSTALL_MOD_PATH=$(MDIR) modules_install
+	$(MAKE) -C $(KDIR) KBUILD_EXTMOD=$(PWD) modules_install
 	depmod $(kernelver)

 clean:
 	rm -rf */.*.o.d */*.o */*.ko */*.mod.c */.*.cmd .tmp_versions Module* modules*
-	$(MAKE) -C apps clean


--- a/apps/Makefile
+++ b/apps/Makefile
@@ -1,34 +1,26 @@
-TARGETS = cit ddtest setmod1 setmod2 modconfig ddinfo getiq modtest
-
-all: $(TARGETS) 
-
-CFLAGS =  -g -Wall -Wno-unused  -Wno-format
-FFMPEG := $(shell command -v ffmpeg 2> /dev/null)
-
-modtest: modtest.c
-	$(CC) -o modtest modtest.c -I../include/ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
-
-test.ts:
-ifndef FFMPEG
-	$(error "ffmpeg is not available please install to create test.ts")
-endif
-	ffmpeg -f lavfi -i testsrc=duration=10:size=1280x720:rate=30  \
-	-f lavfi -i sine=f=440:b=4  -shortest   -metadata \
-	service_provider="DD"      -metadata service_name="Test" test.ts
+all: cit citin flashprog modt ddtest setmod ddflash setmod2 pls setmod3 modconfig ddinfo getiq

 cit: cit.c
 	$(CC) -o cit cit.c -lpthread

+modt: modt.c
+	$(CC) -o modt modt.c -lpthread
+
+setmod: setmod.c
+	$(CC) -o setmod setmod.c -I../include/
+
+setmod2: setmod2.c
+	$(CC) -o setmod2 setmod2.c -I../include/
+
+setmod3: setmod3.c
+	$(CC) -o setmod3 setmod3.c -I../include/
+
+modconfig: modconfig.c
+	$(CC) -o modconfig modconfig.c -I../include/
+
 %: %.c
 	$(CC) $(CFLAGS) -I../ddbridge  -I../include/ $< -o $@

 %.o: %.c
 	$(CC) $(CFLAGS) -I../ddbridge -o $@ $<

-clean:
-	rm test.ts -f
-	for f in $(TARGETS) *.o *~ ; do \
-		if [ -e "$$f" ]; then \
-			rm "$$f" || exit 1; \
-		fi \
-	done
--- a/apps/citin.c
+++ b/apps/citin.c
@@ -0,0 +1,60 @@
+#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 <linux/dvb/dmx.h>
+#include <linux/dvb/frontend.h>
+
+void proc_ts(int i, uint8_t *buf)
+{
+        uint16_t pid=0x1fff&((buf[1]<<8)|buf[2]);
+
+	if (buf[3]&0xc0) /* only descrambled packets */
+		return;
+	/* only ORF */
+	if (pid==160 || pid==161 || pid==1001||pid==13001 || pid==0)
+		write(1, buf, 188);
+}
+
+#define TSBUFSIZE (100*188)
+
+void citest()
+{
+        uint8_t *buf;
+	uint8_t id;
+	int i, nts;
+	int len;
+	int ts=open("/dev/dvb/adapter4/ci0", O_RDONLY);
+	buf=(uint8_t *)malloc(TSBUFSIZE);
+
+	
+	while(1) {
+		len=read(ts, buf, TSBUFSIZE);
+		if (len<0) {
+			continue;
+		}
+		if (buf[0]!=0x47) {
+			read(ts, buf, 1);
+			continue;
+		}
+		if (len%188) { /* should not happen */
+			printf("blah\n");
+			continue;
+		}
+		nts=len/188;
+		for (i=0; i<nts; i++)
+			proc_ts(i, buf+i*188);
+	}
+}
+
+int main()
+{
+	citest();
+}
+
--- a/apps/citout.c
+++ b/apps/citout.c
@@ -0,0 +1,55 @@
+#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 <linux/dvb/dmx.h>
+#include <linux/dvb/frontend.h>
+#include <linux/dvb/video.h>
+
+#define TSBUFSIZE (100*188)
+
+void citest()
+{
+        uint8_t *buf;
+	uint8_t id;
+	int i, nts;
+	int len;
+	int ts0=open("/dev/dvb/adapter0/dvr0", O_RDONLY);
+	int ts1=open("/dev/dvb/adapter4/sec0", O_WRONLY);
+	int demux0=open("/dev/dvb/adapter0/demux0", O_RDWR);
+
+	struct dmx_pes_filter_params pesFilterParams; 
+	
+	pesFilterParams.input = DMX_IN_FRONTEND; 
+	pesFilterParams.output = DMX_OUT_TS_TAP; 
+	pesFilterParams.pes_type = DMX_PES_OTHER; 
+	pesFilterParams.flags = DMX_IMMEDIATE_START;
+  
+	pesFilterParams.pid = 8192;
+	if (ioctl(demux0, DMX_SET_PES_FILTER, &pesFilterParams) < 0) {
+	        printf("Could not set PES filter\n"); 
+		return;
+	}
+	buf=(uint8_t *)malloc(TSBUFSIZE);
+
+	while(1) {
+		len=read(ts0, buf, TSBUFSIZE);
+		if (len<=0)
+			break;
+		if (buf[0]!=0x47)
+			printf("oops\n");
+		write(ts1, buf, len);
+	}
+}
+
+int main()
+{
+	citest();
+}
+
--- a/apps/ddflash.c
+++ b/apps/ddflash.c
@@ -0,0 +1 @@
+octonet/ddflash.c
--- a/apps/ddinfo.c
+++ b/apps/ddinfo.c
@@ -274,7 +274,7 @@ void print_info(int dev, uint32_t link, uint8_t demod, struct mci_result *res)
 	if (res->status == MCI_DEMOD_LOCKED) {
 		switch (res->mode) {
 		case 0:
-		case MX_MODE_DVBSX:
+		case M4_MODE_DVBSX:
 			if (res->dvbs2_signal_info.standard != 1) {
 				int short_frame = 0, pilots = 0;
 				char *modcod = "unknown";
@@ -308,10 +308,10 @@ void print_info(int dev, uint32_t link, uint8_t demod, struct mci_result *res)
 			}
 			printf("Inversion:     %s\n", (res->dvbs2_signal_info.roll_off & 0x80) ? "on": "off");
 			break;
-		case MX_MODE_DVBT:
+		case M4_MODE_DVBT:
 			printf("Locked DVB-T\n");
 			break;
-		case MX_MODE_DVBT2:
+		case M4_MODE_DVBT2:
 			printf("Locked DVB-T2\n");
 			break;
 		}
--- a/apps/flashprog.c
+++ b/apps/flashprog.c
@@ -0,0 +1,290 @@
+/*
+/* flashprog - Programmer for flash on Digital Devices Octopus 
+ *
+ * Copyright (C) 2010-2011 Digital Devices GmbH
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 only, as published by the Free Software Foundation.
+ *
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA
+ * Or, point your browser to http://www.gnu.org/copyleft/gpl.html
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <unistd.h>
+#include <getopt.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <string.h>
+#include <sys/ioctl.h>
+#include <linux/types.h>
+#include <errno.h>
+
+#include "flash.h"
+#include "flash.c"
+
+void get_ddid(int ddb, struct ddb_id *ddbid) {
+	uint8_t id[4];
+
+	if (ioctl(ddb, IOCTL_DDB_ID, ddbid)>=0)
+		return;
+	memset(ddbid, 0, sizeof(*ddbid));
+	flashread(ddb, linknr, id, 0, 4);
+	printf("%02x %02x %02x %02x\n", 
+	       id[0], id[1], id[2], id[3]);
+	ddbid->subvendor=(id[0] << 8) | id[1];
+	ddbid->subdevice=(id[2] << 8) | id[3];
+}
+
+int sure()
+{
+	char c;
+
+	printf("\n\nWARNING! Flashing a new FPGA image might make your card unusable!\n");
+	printf("\n\nWARNUNG! Das Flashen eines neuen FPGA-Images kann Ihre Karte unbrauchbar machen.\n");
+	printf("\n\nAre you sure? y/n?");
+	printf("\n\nSind Sie sicher? y/n?");
+	fflush(0);
+	c = getchar();
+	if (c!='y') {
+		printf("\nFlashing aborted.\n\n");
+		return -1;
+	}
+	printf("\nStarting to flash\n\n");
+	return 0;
+}
+
+
+int main(int argc, char **argv)
+{
+	char ddbname[80];
+	char *flashname;
+	int type = 0;
+	struct ddb_id ddbid;
+	uint8_t *buffer;
+	int BufferSize = 0;
+	int BlockErase = 0;
+	uint32_t FlashOffset = 0x10000;
+	int ddb;
+	int i, err;
+	uint32_t SectorSize=0;
+	uint32_t FlashSize=0;
+	int Flash;
+
+	uint32_t svid=0, jump=0, dump=0;
+	int bin;
+
+	int ddbnum = 0;
+	int force = 0;
+	char *fname = NULL;
+
+        while (1) {
+                int option_index = 0;
+		int c;
+                static struct option long_options[] = {
+			{"svid", required_argument, NULL, 's'},
+			{"help", no_argument , NULL, 'h'},
+			{"force", no_argument , NULL, 'f'},
+			{0, 0, 0, 0}
+		};
+                c = getopt_long(argc, argv, 
+				"d:n:s:o:l:dfhjb:",
+				long_options, &option_index);
+		if (c==-1)
+			break;
+
+		switch (c) {
+		case 'b':
+			fname = optarg;
+			break;
+		case 'd':
+			dump = strtoul(optarg, NULL, 16);
+			break;
+		case 's':
+			svid = strtoul(optarg, NULL, 16);
+			break;
+		case 'o':
+			FlashOffset = strtoul(optarg, NULL, 16);
+			break;
+		case 'n':
+			ddbnum = strtol(optarg, NULL, 0);
+			break;
+		case 'l':
+			linknr = strtol(optarg, NULL, 0);
+			break;
+		case 'f':
+			force = 1;
+			break;
+		case 'j':
+			jump = 1;
+			break;
+		case 'h':
+		default:
+			break;
+
+		}
+	}
+	if (optind<argc) {
+		printf("Warning: unused arguments\n");
+	}
+
+	sprintf(ddbname, "/dev/ddbridge/card%d", ddbnum);
+	ddb=open(ddbname, O_RDWR);
+	if (ddb < 0) {
+		printf("Could not open device\n");
+		return -1;
+	}
+	Flash = flashdetect(ddb, &SectorSize, &FlashSize, &flashname);
+
+	get_ddid(ddb, &ddbid);
+#if 0
+	printf("%04x %04x %04x %04x %08x %08x\n",
+	       ddbid.vendor, ddbid.device,
+	       ddbid.subvendor, ddbid.subdevice,
+	       ddbid.hw, ddbid.regmap);
+#endif
+
+	if (dump) {
+		flashdump(ddb, linknr, dump, 128);
+		return 0;
+	}
+
+	if (!SectorSize)
+		return 0;
+	
+	if (jump) {
+		uint32_t Jump = 0x200000;
+		
+		BufferSize = SectorSize;
+		FlashOffset = FlashSize - SectorSize;
+		buffer = malloc(BufferSize);
+		if (!buffer) {
+			printf("out of memory\n");
+			return 0;
+		}
+		memset(buffer, 0xFF, BufferSize);
+		memset(&buffer[BufferSize - 256 + 0x10], 0x00, 16);
+
+		buffer[BufferSize - 256 + 0x10] = 0xbd;
+		buffer[BufferSize - 256 + 0x11] = 0xb3;
+		buffer[BufferSize - 256 + 0x12] = 0xc4;
+		buffer[BufferSize - 256 + 0x1a] = 0xfe;
+		buffer[BufferSize - 256 + 0x1e] = 0x03;
+		buffer[BufferSize - 256 + 0x1f] = ( ( Jump >> 16 ) & 0xFF );
+		buffer[BufferSize - 256 + 0x20] = ( ( Jump >>  8 ) & 0xFF );
+		buffer[BufferSize - 256 + 0x21] = ( ( Jump       ) & 0xFF );
+	} else if (svid) {
+		BufferSize = SectorSize;
+		FlashOffset = 0;
+		
+		buffer = malloc(BufferSize);
+		if (!buffer) {
+			printf("out of memory\n");
+			return 0;
+		}
+		memset(buffer,0xFF,BufferSize);
+		
+		buffer[0] = ((svid >> 24 ) & 0xFF);
+		buffer[1] = ((svid >> 16 ) & 0xFF);
+		buffer[2] = ((svid >>  8 ) & 0xFF);
+		buffer[3] = ((svid       ) & 0xFF);
+	} else {
+		int fh, i;
+		int fsize;
+		char *name;
+
+		if (!fname) 
+			fname = devid2fname(ddbid.device, &name);
+		if (name)
+			printf("Card: %s\n", name);
+		
+		fh = open(fname, O_RDONLY);
+		if (fh < 0 ) {
+			printf("File %s not found \n", fname);
+			return 0;
+		}
+		printf("Using bitstream %s\n", fname);
+
+		fsize = lseek(fh,0,SEEK_END);
+		if( fsize > FlashSize/2 - 0x10000 || fsize < SectorSize )
+		{
+			close(fh);
+			printf("Invalid File Size \n");
+			return 0;
+		}
+		
+		if( Flash == ATMEL_AT45DB642D ) {
+			BlockErase = fsize >= 8192;
+			if( BlockErase )
+				BufferSize = (fsize + 8191) & ~8191;
+			else
+				BufferSize = (fsize + 1023) & ~1023;
+		} else {
+			BufferSize = (fsize + SectorSize - 1 ) & ~(SectorSize - 1);
+		}
+		printf(" Size     %08x, target %08x\n", BufferSize, FlashOffset);
+		
+		buffer = malloc(BufferSize);
+
+		if( buffer == NULL ) {
+			close(fh);
+			printf("out of memory\n");
+			return 0;
+		}
+	
+		memset(buffer, 0xFF, BufferSize);
+		lseek(fh, 0, SEEK_SET);
+		read(fh, buffer, fsize);
+		close(fh);
+		
+		if (BufferSize >= 0x10000) {
+			for(i = 0; i < 0x200; i += 1 ) {
+				if ( *(uint16_t *) (&buffer[i]) == 0xFFFF )
+					break;
+				buffer[i] = 0xFF;
+			}
+		}
+	}
+	if (!force && sure()<0)
+		return 0;
+	switch(Flash) {
+        case ATMEL_AT45DB642D:
+		err = FlashWriteAtmel(ddb,FlashOffset,buffer,BufferSize);
+		break;
+        case SSTI_SST25VF016B: 
+        case SSTI_SST25VF032B:
+		err = FlashWriteSSTI_B(ddb,FlashOffset,buffer,BufferSize);
+		break;
+        case SSTI_SST25VF064C:
+		err = FlashWritePageMode(ddb,FlashOffset,buffer,BufferSize,0x3C);
+		break;
+        case SPANSION_S25FL116K:
+        case SPANSION_S25FL164K:
+	case WINBOND_W25Q16JV:
+	case WINBOND_W25Q32JV:
+		err = FlashWritePageMode(ddb,FlashOffset,buffer,BufferSize,0x1C);
+		break;            
+	}
+	
+	if (err < 0) 
+		printf("Programming Error\n");
+	else
+		printf("Programming Done\n");
+	
+	free(buffer);
+	return 0;
+}
--- a/apps/modconfig.c
+++ b/apps/modconfig.c
@@ -276,10 +276,10 @@ int mci_cmd(int dev, struct mci_command *cmd)
 	memset(&msg, 0, sizeof(msg));
 	msg.link = 0;
 	memcpy(&msg.cmd, cmd, sizeof(msg.cmd));
-	//dump((const uint8_t *) &msg.cmd, sizeof(msg.cmd));
+	//dump((uint8_t *) &msg.cmd, sizeof(msg.cmd));
 	ret = ioctl(dev, IOCTL_DDB_MCI_CMD, &msg);
 	if (ret < 0) {
-	    dprintf(2, "mci_cmd error %d (%s)\n", errno, strerror(errno));
+		dprintf(2, "mci_cmd error %d\n", errno);
 		return ret;
 	}
 	status = msg.res.status;
@@ -310,10 +310,16 @@ struct mci_command msg_channels = {

 struct mci_command msg_stream = {
 	.mod_command = MOD_SETUP_STREAM,
-	.mod_channel = 0,
+	.mod_channel = 1,
 	.mod_stream = 0,
 	.mod_setup_stream = {
 		.standard = MOD_STANDARD_DVBC_8,
+#if 0
+		.ofdm = {
+			.fft_size = 1,
+			.guard_interval = 0,
+		}
+#endif
 	},
 };

@@ -375,7 +381,6 @@ void channels_cb(void *priv, char *par, char *val)
 		printf("frequency = %u\n", mc->channels.mod_setup_channels[0].frequency);
 	} else if (!strcasecmp(par, "channels")) {
 		mc->channels.mod_setup_channels[0].num_channels = strtol(val, NULL, 10);
-		printf("channels = %u\n", mc->channels.mod_setup_channels[0].num_channels);
 	} else if (!strcasecmp(par, "standard")) {
 		if (!parse_param(val,mod_standard_table, &value))
 			mc->channels.mod_setup_channels[0].standard = value;
@@ -429,15 +434,6 @@ void streams_cb(void *priv, char *par, char *val)
 	} else if (!strcasecmp(par, "stream")) {
 		mc->stream.mod_stream = strtol(val, NULL, 10);
 		printf("set stream %u to channel %u\n", mc->stream.mod_stream, mc->stream.mod_channel);
-		printf("%u %u %u %u %u %u %u %u\n",
-		       mc->stream.mod_command,
-		       mc->stream.mod_channel,
-		       mc->stream.mod_stream,
-		       mc->stream.mod_setup_stream.standard,
-		       mc->stream.mod_setup_stream.symbol_rate,
-		       mc->stream.mod_setup_stream.stream_format,
-		       mc->stream.mod_setup_stream.qam.modulation,
-		       mc->stream.mod_setup_stream.qam.rolloff);
 		mci_cmd(mc->fd, &mc->stream);
 	} else
 		printf("invalid streams parameter: %s = %s\n", par, val);
@@ -462,7 +458,7 @@ int mci_lic(int dev)
 		printf("MATYPE1: %02x\n", res->bb_header.matype_1);
 		printf("MATYPE2: %02x\n", res->bb_header.matype_2);
 	}
-	dump((const uint8_t *)&res->license, sizeof(res->license));
+	dump(&res->license, sizeof(res->license));
 	return ret;
 }

@@ -490,7 +486,7 @@ int main(int argc, char*argv[])
 			{"help", no_argument, 0, 'h'},
 			{0, 0, 0, 0}
 		};
-		c = getopt_long(argc, argv, "d:c:",
+								c = getopt_long(argc, argv, "d:c:",
 				long_options, &option_index);
 		if (c == -1)
 			break;
--- a/apps/modt.c
+++ b/apps/modt.c
@@ -0,0 +1,36 @@
+#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>
+
+
+#define SNUM 1000
+//671
+void send(void)
+{
+	uint8_t buf[188*SNUM], *cts;
+	int i;
+	uint32_t c=0;
+	int fdo;
+
+	fdo=open("/dev/dvb/adapter0/mod0", O_WRONLY);
+
+
+	while (1) {
+		read(0, buf, sizeof(buf));
+		write(fdo, buf, 188*SNUM);
+	}
+}
+
+
+int main()
+{
+	send();
+}
--- a/apps/modtest.c
+++ b/apps/modtest.c
--- a/apps/octonet/ddtest.c
+++ b/apps/octonet/ddtest.c
@@ -1362,7 +1362,7 @@ int read_id(int dev, int argc, char* argv[], uint32_t Flags)
 	for (i = 0; i < len; i++)
 		printf("%02x ", Id[i]);
 	printf("\n");
-	return 0;
+
 }

 int i2cread(int dev, int argc, char* argv[], uint32_t Flags)
--- a/apps/octonet/ddupdate.c
+++ b/apps/octonet/ddupdate.c
@@ -36,7 +36,6 @@ static int update_flash(struct ddflash *ddf)
 	char *fname, *default_fname;
 	int res, stat = 0;
 	char *name = 0, *dname;
-	uint32_t imgadr = 0x10000;
 	
 	switch (ddf->id.device) {
 	case 0x300:
@@ -110,14 +109,6 @@ static int update_flash(struct ddflash *ddf)
 		return stat;
 		break;
 	default:
-	{
-		uint32_t val;
-		if (!readreg(ddf->fd, (ddf->link << 28) | 0x10, &val)) {
-			//printf("reg0x10=%08x\n", val);
-			if ((val >> 24) == 5)
-				imgadr = 0;
-		}
-	}
 		fname = ddf->fname;
 		default_fname = devid2fname(ddf->id.device, &name);
 		if (!fname)
@@ -128,8 +119,7 @@ static int update_flash(struct ddflash *ddf)
 			printf("Flash:    %s\n", ddf->flash_name);
 		printf("Version:  %08x\n", ddf->id.hw);
 		printf("REGMAP :  %08x\n", ddf->id.regmap);
-		printf("Address:  %08x\n", imgadr);
-		if ((res = update_image(ddf, fname, imgadr, ddf->size / 2, 1, 0)) == 1)
+		if ((res = update_image(ddf, fname, 0x10000, ddf->size / 2, 1, 0)) == 1)
 			stat |= 1;
 		return stat;
 	}
--- a/apps/octonet/flash.c
+++ b/apps/octonet/flash.c
@@ -167,7 +167,7 @@ static int flashread(int ddb, int link, uint8_t *buf, uint32_t addr, uint32_t le
 }
 #endif

-void flashdump(int ddb, int link, uint32_t addr, uint32_t len)
+int flashdump(int ddb, int link, uint32_t addr, uint32_t len)
 {
 	int i, j;
 	uint8_t buf[32];
@@ -630,14 +630,13 @@ int flashwrite_pagemode(struct ddflash *ddf, int dev, uint32_t FlashOffset,
 	uint8_t cmd[260];
 	int i, j;
 	uint32_t flen, blen;
-	int blockerase;
+	int blockerase = be && ((FlashOffset & 0xFFFF) == 0 ) && (flen >= 0x10000);
 	
 	blen = flen = lseek(dev, 0, SEEK_END) - fw_off;
 	if (blen % 0xff)
 		blen = (blen + 0xff) & 0xffffff00; 
 	//printf("blen = %u, flen = %u\n", blen, flen);
 	setbuf(stdout, NULL);
-	blockerase = be && ((FlashOffset & 0xFFFF) == 0 ) && (flen >= 0x10000);

 	cmd[0] = 0x50;  // EWSR
 	err = flashio(ddf->fd, ddf->link, cmd, 1, NULL, 0);
@@ -928,10 +927,7 @@ static const struct devids ids[] = {
 	DEV(0x0011, "Octopus CI", "DVBBridgeV2B_DD01_0011.fpga"),
 	DEV(0x0012, "Octopus CI", "DVBBridgeV2B_DD01_0012_STD.fpga"),
 	DEV(0x0013, "Octopus PRO", "DVBBridgeV2B_DD01_0013_PRO.fpga"),
-	DEV(0x0014, "Octopus CI M2", "DVBBridgeV3A_DD01_0014_CIM2.fpga"),
 	DEV(0x0020, "Octopus GT Mini", "DVBBridgeV2C_DD01_0020.fpga"),
-	DEV(0x0022, "Octopus MAXM8", "DVBBridgeV3A_DD01_0022_M8.fpga"),
-	DEV(0x0024, "Octopus MAXM8A", "DVBBridgeV3A_DD01_0024_M8A.fpga"),
 	DEV(0x0201, "Modulator", "DVBModulatorV1B_DVBModulatorV1B.bit"),
 	DEV(0x0203, "Modulator Test", "DVBModulatorV1B_DD01_0203.fpga"),
 	DEV(0x0210, "Modulator V2", "DVBModulatorV2A_DD01_0210.fpga"),
@@ -1079,12 +1075,12 @@ static int check_fw(struct ddflash *ddf, char *fn, uint32_t *fw_off)
 	close(fd);
 	
 	for (p = 0; p < fsize && buf[p]; p++) {
-		char *key = (char *) &buf[p], *val = NULL;
+		char *key = &buf[p], *val = NULL;

 		for (; p < fsize && buf[p] != 0x0a; p++) {
 			if (buf[p] == ':') {
 				buf[p] = 0;
-				val = (char *) &buf[p + 1];
+				val = &buf[p + 1];
 			}
 		}
 		if (val == NULL || p == fsize)
--- a/apps/pls.c
+++ b/apps/pls.c
@@ -0,0 +1,167 @@
+/*
+ * pls.c: Convert between Gold and Root Codes for DVB-S2 PLS
+ *
+ * Copyright (C) 2017 Marcus Metzler <mocm@metzlerbros.de>
+ *                    Ralph Metzler <rjkm@metzlerbros.de>
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 only, as published by the Free Software Foundation.
+ *
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA
+ * Or, point your browser to http://www.gnu.org/copyleft/gpl.html
+ */
+
+#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 <getopt.h>
+#include <stdio.h>
+#include <stdint.h>
+
+/* According to ETSI EN 302 307 5.5.4 the PLS (Physical Layer
+   Scrambling) for DVB-S2 consists of a complex randomization
+   sequence which is ultimately derived from two recursively
+   defined m-sequences  (=MLS or maximum length sequences)
+   x(i) and y(i) of polynomials over GF(2) with m=18
+   (thus their length is 2^18 - 1).
+   These m-sequences with sequence y starting from y(0) and
+   sequence x starting from x(n) are combined to form a set
+   of 2^18 - 1 different Gold code sequences.
+
+   This starting number n of sequence x selects which
+   of those 2^18 - 1 Gold code sequences to use.
+   As a DVB-S2 tuning parameter n is called the scrambling sequence index 
+   (cf. ETSI EN 300 468 table 41) or Gold sequence index,
+   commonly also just called "Gold code".
+   The 18 values of the sequence x starting from x(n)
+   (x(n) ... x(n+17)) are also called the "Root code".
+   So, Gold and Root codes are not different ways of PLS, they are
+   just different ways to select the same sequence start point.
+     
+   The initial values for x(i), i=0..18 are x(0)=1, x(1)=0, .., x(17)=0 .  
+   The polynomial used for the x sequence recursion is 1+x^7+x^18.
+   If the lower 18 bits of a variable "uint32_t X" contain x(n) ... x(n+17),
+   then we can simply calculate x(n+1) ... x(n+18) by doing:
+   X = (((X ^ (X >> 7)) & 1) << 17) | (X >> 1);
+  
+   So, if X contained the "Root code" corresponding to "Gold code" n,
+   it will now contain the "Root code" corresponding to "Gold code" (n+1).
+   Note that X=0 and n=2^18 - 1 do not exist (or rather the lattter is the same
+   as n = 0) and for n=0 to 2^18 - 2 and X=1 to 2^18 - 1 there is a
+   one-to-one correspondence (bijection).
+
+   Note that PLS has nothing to do with encryption for DRM purposes. It is used
+   to minimize interference between transponders.
+
+
+   "Combo code":
+   There is no such thing as a combo code. It is the result of a bug in older
+   STV090x drivers which resulted in a crazy race condition between a Gold->Root
+   conversion in the STV and an ongoing I2C write. 
+   Better forget about it and determine the proper Root or Gold code.
+      
+ */
+
+
+static uint32_t gold2root(uint32_t gold)
+{
+	uint32_t x, g;
+	
+	for (g = 0, x = 1; g < gold; g++)
+		x = (((x ^ (x >> 7)) & 1) << 17) | (x >> 1);
+	return x;
+}
+
+static uint32_t root2gold(uint32_t root)
+{
+	uint32_t x, g;
+	
+	for (g = 0, x = 1; g < 0x3ffff; g++)  {
+		if (root == x)
+			return g;
+		x = (((x ^ (x >> 7)) & 1) << 17) | (x >> 1);
+	}
+	return 0xffffffff;
+}
+
+int main(int argc, char **argv)
+{
+	uint32_t gold = 0xffffffff, root = 0xffffffff;
+	
+	while (1) {
+                int option_index = 0;
+		int c;
+                static struct option long_options[] = {
+			{"gold", required_argument, 0, 'g'},
+			{"root", required_argument, 0, 'r'},
+			{"help", no_argument , 0, 'h'},
+			{0, 0, 0, 0}
+		};
+                c = getopt_long(argc, argv, 
+				"r:g:h",
+				long_options, &option_index);
+		if (c==-1)
+ 			break;
+		
+		switch (c) {
+		case 'g':
+			gold = strtoul(optarg, NULL, 0);
+			break;
+		case 'r':
+			root = strtoul(optarg, NULL, 0);
+			break;
+		case 'h':
+			printf("pls -g gold_code\n");
+			printf("or\n");
+			printf("pls -r root_code\n");
+			exit(-1);
+		default:
+			break;
+			
+		}
+	}
+	if (optind < argc) {
+		printf("Warning: unused arguments\n");
+	}
+	if (gold != 0xffffffff && root != 0xffffffff) {
+		printf("Only specify root or gold code\n");
+		exit(-1);
+	};
+	if (gold != 0xffffffff) {
+		if (gold < 0x3ffff) {
+			root = gold2root(gold);
+			printf("gold = %llu (0x%05x)   root = %llu (0x%05x)\n",
+			       gold, gold, root, root);
+		} else
+			printf("Invalid gold code specified.\n");
+		exit(0);
+	} 
+	if (root != 0xffffffff) {
+		if (root > 0 && root < 0x40000)
+			gold = root2gold(root);
+		if (gold != 0xffffffff)
+			printf("gold = %llu (0x%05x)   root = %llu (0x%05x)\n",
+			       gold, gold, root, root);
+		else
+			printf("Invalid root code specified.\n");
+		exit(0);
+	}
+	printf("Specify either root or gold code with -r or -g.\n");
+}
--- a/apps/setmod1.c
+++ b/apps/setmod1.c
--- a/apps/setmod2.c
+++ b/apps/setmod2.c
@@ -10,7 +10,6 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <pthread.h>
-#include <getopt.h>

 #include <linux/dvb/mod.h>

@@ -32,134 +31,17 @@ static int set_property(int fd, uint32_t cmd, uint32_t data)
 	return 0;
 }

-static int get_property(int fd, uint32_t cmd, uint32_t *data)
-{
-	struct dtv_property p;
-	struct dtv_properties c;
-	int ret;
-
-	p.cmd = cmd;
-	c.num = 1;
-	c.props = &p;
-	ret = ioctl(fd, FE_GET_PROPERTY, &c);
-	if (ret < 0) {
-		fprintf(stderr, "FE_GET_PROPERTY returned %d\n", ret);
-		return -1;
-	}
-	*data = p.u.data;
-	return 0;
-}
-
-
-
-int main(int argc, char*argv[])
+int main()
 {
 	int fd;
 	struct dvb_mod_params mp;
 	struct dvb_mod_channel_params mc;
-	uint32_t data;
-	int32_t adapter = 0, channel = 0, gain = -1, att=-1, mod=-1;
-	int32_t base = -1, freq = -1, rate = -1, srate = -1;
-	char mod_name[128];
-	
-	while (1) {
-		int cur_optind = optind ? optind : 1;
-		int option_index = 0;
-		int c;
-		static struct option long_options[] = {
-			{"adapter", required_argument, 0, 'a'},
-			{"channel", required_argument, 0, 'c'},
-			{"att", required_argument, 0, 't'},
-			{"gain", required_argument, 0, 'g'},
-			{"base", required_argument, 0, 'b'},
-			{"frequency", required_argument, 0, 'f'},
-			{"rate", required_argument, 0, 'r'},
-			{"modulation", required_argument, 0, 'm'},
-			{"symbolrate", required_argument, 0, 's'},
-			{0, 0, 0, 0}
-		};
-                c = getopt_long(argc, argv, 
-				"a:c:g:b:f:r:t:m:s:",
-				long_options, &option_index);
-		if (c==-1)
-			break;

-		switch (c) {
-		case 'a':
-			adapter = strtoul(optarg, NULL, 0);
-			break;
-		case 'c':
-			channel = strtoul(optarg, NULL, 0);
-			break;
-		case 'g':
-			gain = strtoul(optarg, NULL, 0);
-			break;
-		case 't':
-			att = strtoul(optarg, NULL, 0);
-			break;
-		case 'b':
-			base = strtoul(optarg, NULL, 0);
-			break;
-		case 'f':
-			freq = strtoul(optarg, NULL, 0);
-			break;
-		case 'm':
-			mod = strtoul(optarg, NULL, 0);
-			break;
-		case 's':
-			srate = strtoul(optarg, NULL, 0);
-			break;
-		case 'r':
-			if (!strcmp(optarg, "DVBT_8"))
-				rate = SYS_DVBT_8;
-			else if (!strcmp(optarg, "DVBT_7"))
-				rate = SYS_DVBT_7;
-			else if (!strcmp(optarg, "DVBT_6"))
-				rate = SYS_DVBT_6;
-			else if (!strcmp(optarg, "ISDBT_6"))
-				rate = SYS_ISDBT_6;
-			else rate = strtoul(optarg, NULL, 0);
-			break;
-		default:
-			break;
-		}
-	}
-	if (optind < argc) {
-		printf("too many arguments\n");
-		exit(1);
-	}
+	fd = open("/dev/dvb/adapter0/mod0", O_RDONLY);

-	snprintf(mod_name, 127, "/dev/dvb/adapter%d/mod%d", adapter, channel);
-	fd = open(mod_name, O_RDONLY);
-	
-	if (fd < 0)  {
-		printf("Could not open modulator device.\n");
-		exit(1);
-	}
-		
-	
-	/* gain 0-255 */
-	//get_property(fd, MODULATOR_GAIN, &data);
-	//printf("Modulator gain = %u\n", data);
-	//set_property(fd, MODULATOR_GAIN, 100);
-
-	//get_property(fd, MODULATOR_ATTENUATOR, &data);
-	//printf("Modulator attenuator = %u\n", data);
-
-	if (att >= 0)
-		set_property(fd, MODULATOR_ATTENUATOR, att);
-	if (gain >= 0)
-		set_property(fd, MODULATOR_GAIN, gain);
-	if (base > 0)
-		set_property(fd, MODULATOR_BASE_FREQUENCY, base);
-	if (freq > 0)
-		set_property(fd, MODULATOR_FREQUENCY, freq);
-	if (rate > 0)
-		set_property(fd, MODULATOR_OUTPUT_RATE, rate);
-	if (mod >= 0)
-		set_property(fd, MODULATOR_MODULATION, mod);
-	if (srate > 0)
-		set_property(fd, MODULATOR_SYMBOL_RATE, srate);
+	set_property(fd, MODULATOR_MODULATION, QAM_256);
+	set_property(fd, MODULATOR_SYMBOL_RATE, 6900000);
+	set_property(fd, MODULATOR_FREQUENCY, 114000000);
 	close(fd);
 }

--- a/apps/setmod3.c
+++ b/apps/setmod3.c
@@ -0,0 +1,149 @@
+#include <errno.h>
+#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 <getopt.h>
+
+#include <linux/dvb/mod.h>
+
+static int set_property(int fd, uint32_t cmd, uint32_t data)
+{
+	struct dtv_property p;
+	struct dtv_properties c;
+	int ret;
+
+	p.cmd = cmd;
+	c.num = 1;
+	c.props = &p;
+	p.u.data = data;
+	ret = ioctl(fd, FE_SET_PROPERTY, &c);
+	if (ret < 0) {
+		fprintf(stderr, "FE_SET_PROPERTY returned %d\n", errno);
+		return -1;
+	}
+	return 0;
+}
+
+static int get_property(int fd, uint32_t cmd, uint32_t *data)
+{
+	struct dtv_property p;
+	struct dtv_properties c;
+	int ret;
+
+	p.cmd = cmd;
+	c.num = 1;
+	c.props = &p;
+	ret = ioctl(fd, FE_GET_PROPERTY, &c);
+	if (ret < 0) {
+		fprintf(stderr, "FE_GET_PROPERTY returned %d\n", ret);
+		return -1;
+	}
+	*data = p.u.data;
+	return 0;
+}
+
+
+
+int main(int argc, char*argv[])
+{
+	int fd;
+	struct dvb_mod_params mp;
+	struct dvb_mod_channel_params mc;
+	uint32_t data;
+	int32_t adapter = 0, channel = 0, gain = -1;
+	int32_t base = -1, freq = -1, rate = -1;
+	char mod_name[128];
+	
+	while (1) {
+		int cur_optind = optind ? optind : 1;
+		int option_index = 0;
+		int c;
+		static struct option long_options[] = {
+			{"adapter", required_argument, 0, 'a'},
+			{"channel", required_argument, 0, 'c'},
+			{"gain", required_argument, 0, 'g'},
+			{"base", required_argument, 0, 'b'},
+			{"frequency", required_argument, 0, 'f'},
+			{"rate", required_argument, 0, 'r'},
+			{0, 0, 0, 0}
+		};
+                c = getopt_long(argc, argv, 
+				"a:c:g:b:f:r:",
+				long_options, &option_index);
+		if (c==-1)
+			break;
+
+		switch (c) {
+		case 'a':
+			adapter = strtoul(optarg, NULL, 0);
+			break;
+		case 'c':
+			channel = strtoul(optarg, NULL, 0);
+			break;
+		case 'g':
+			gain = strtoul(optarg, NULL, 0);
+			break;
+		case 'b':
+			base = strtoul(optarg, NULL, 0);
+			break;
+		case 'f':
+			freq = strtoul(optarg, NULL, 0);
+			break;
+		case 'r':
+			if (!strcmp(optarg, "DVBT_8"))
+				rate = SYS_DVBT_8;
+			else if (!strcmp(optarg, "DVBT_7"))
+				rate = SYS_DVBT_7;
+			else if (!strcmp(optarg, "DVBT_6"))
+				rate = SYS_DVBT_6;
+			else if (!strcmp(optarg, "ISDBT_6"))
+				rate = SYS_ISDBT_6;
+			else rate = strtoul(optarg, NULL, 0);
+			break;
+		default:
+			break;
+		}
+	}
+	if (optind < argc) {
+		printf("too many arguments\n");
+		exit(1);
+	}
+
+	snprintf(mod_name, 127, "/dev/dvb/adapter%d/mod%d", adapter, channel);
+	fd = open(mod_name, O_RDONLY);
+	
+	if (fd < 0)  {
+		printf("Could not open modulator device.\n");
+		exit(1);
+	}
+		
+	
+	/* gain 0-255 */
+	//get_property(fd, MODULATOR_GAIN, &data);
+	//printf("Modulator gain = %u\n", data);
+	//set_property(fd, MODULATOR_GAIN, 100);
+
+	//get_property(fd, MODULATOR_ATTENUATOR, &data);
+	//printf("Modulator attenuator = %u\n", data);
+
+	if (gain > 0)
+		set_property(fd, MODULATOR_GAIN, gain);
+	if (base > 0)
+		set_property(fd, MODULATOR_BASE_FREQUENCY, base);
+	if (freq > 0)
+		set_property(fd, MODULATOR_FREQUENCY, freq);
+	if (rate > 0)
+		set_property(fd, MODULATOR_OUTPUT_RATE, rate);
+	
+	
+	close(fd);
+}
+
--- a/apps/tscheck.c
+++ b/apps/tscheck.c
@@ -0,0 +1,105 @@
+#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 <linux/dvb/dmx.h>
+#include <linux/dvb/frontend.h>
+#include <linux/dvb/video.h>
+
+char line_start[16] = "";
+char line_end[16]   = "\r";
+
+
+uint32_t cc_errors = 0;
+uint32_t packets = 0;
+uint32_t payload_packets = 0;
+uint32_t packet_errors = 0;
+
+uint8_t cc[8192] = { 0 };
+
+void proc_ts(int i, uint8_t *buf)
+{
+	uint16_t pid= 0x1fff& ((buf[1] << 8) | buf[2]);
+	uint8_t ccin = buf[3] & 0x1f;
+
+	if( buf[0] == 0x47 && (buf[1] & 0x80) == 0) {
+		if( pid != 8191 ) {
+			if (ccin & 0x10) {
+				if( cc[pid] != 0 ) {
+					// TODO: 1 repetition allowed
+					if ((((cc[pid] + 1) & 0x0F) != (ccin & 0x0F)) )  {
+						cc_errors += 1;
+						printf("%04x: %u != %u\n", pid, (cc[pid] + 1) & 0x0F, ccin & 0x0F);
+					}
+				}
+				cc[pid] = ccin;
+			}
+			payload_packets += 1;
+		}
+	} else
+		packet_errors += 1;
+	
+	if( (packets & 0x3FFF ) == 0) {
+		printf("%s  Packets: %12u non null %12u, errors: %12u, CC errors: %12u%s",
+		       line_start, packets, payload_packets, packet_errors, cc_errors, line_end);
+		fflush(stdout);
+	}
+	packets += 1;  
+}
+
+#define TSBUFSIZE (100*188)
+
+void citest(char* n)
+{
+	uint8_t *buf;
+	uint8_t id;
+	int i, nts;
+	int len;
+	int ts=open(n, O_RDONLY);
+	buf=(uint8_t *)malloc(TSBUFSIZE);
+	
+	
+	while(1) {
+		len=read(ts, buf, TSBUFSIZE);
+		if (len<0) {
+			continue;
+		}
+		if (buf[0]!=0x47) {
+			read(ts, buf, 1);
+			continue;
+		}
+		if (len%188) { /* should not happen */
+			printf("blah\n");
+			continue;
+		}
+		nts=len/188;
+		for (i=0; i<nts; i++)
+			proc_ts(i, buf+i*188);
+	}
+}
+
+int main(int argc, char* argv[])
+{
+	if( argc < 2 )
+	{
+		printf("tscheck <file>|<device> [<display line>]\n");
+		exit(0);
+	}
+	if( argc > 2 )
+	{
+		int line = atoi(argv[2]);
+		if( line >= 0 && line < 64 )
+		{
+			snprintf(line_start,sizeof(line_start)-1,"\0337\033[%d;0H",line);
+			strncpy(line_end,"\0338",sizeof(line_end)-1);
+		}
+	}
+	citest(argv[1]);
+}
+
--- a/ddbridge/Kbuild
+++ b/ddbridge/Kbuild
@@ -4,7 +4,9 @@ ddbridge-objs = ddbridge-main.o ddbridge-hw.o ddbridge-i2c.o ddbridge-ns.o ddbri

 octonet-objs = octonet-main.o ddbridge-hw.o ddbridge-i2c.o ddbridge-ns.o ddbridge-modulator.o ddbridge-core.o ddbridge-io.o ddbridge-ci.o ddbridge-max.o ddbridge-mci.o ddbridge-sx8.o ddbridge-m4.o dvb_netstream.o

-obj-$(CONFIG_DVB_DDBRIDGE) += ddbridge.o
+#mci-objs = ddbridge-mci.o ddbridge-sx8.o ddbridge-m4.o ddbridge-io.o
+
+obj-$(CONFIG_DVB_DDBRIDGE) += ddbridge.o #mci.o

 ifneq ($(KERNEL_DVB_CORE),y)
 obj-$(CONFIG_DVB_OCTONET) += octonet.o
--- a/ddbridge/Makefile
+++ b/ddbridge/Makefile
@@ -1,13 +1,15 @@
 #
 # Makefile for the ddbridge device driver
 #
+#NOSTDINC_FLAGS += -I$(KBUILD_EXTMOD)/include -I$(KBUILD_EXTMOD)/include/linux -I$(KBUILD_EXTMOD)/dvb-frontends -I$(KBUILD_EXTMOD)/tuners

-ddbridge-objs = ddbridge-main.o ddbridge-hw.o ddbridge-i2c.o ddbridge-ns.o ddbridge-modulator.o ddbridge-core.o ddbridge-io.o ddbridge-ci.o ddbridge-max.o ddbridge-mci.o ddbridge-sx8.o ddbridge-m4.o dvb_netstream.o
-octonet-objs = octonet-main.o ddbridge-hw.o ddbridge-i2c.o ddbridge-ns.o ddbridge-modulator.o ddbridge-core.o ddbridge-io.o ddbridge-ci.o ddbridge-max.o ddbridge-mci.o ddbridge-sx8.o ddbridge-m4.o dvb_netstream.o
+ddbridge-objs = ddbridge-main.o ddbridge-hw.o ddbridge-i2c.o ddbridge-ns.o ddbridge-modulator.o ddbridge-core.o ddbridge-ci.o ddbridge-max.o ddbridge-mci.o ddbridge-sx8.o ddbridge-m4.o dvb_netstream.o
+octonet-objs = octonet-main.o ddbridge-hw.o ddbridge-i2c.o ddbridge-ns.o ddbridge-modulator.o ddbridge-core.o ddbridge-ci.o ddbridge-max.o ddbridge-mci.o ddbridge-sx8.o ddbridge-m4.o dvb_netstream.o

 obj-$(CONFIG_DVB_DDBRIDGE) += ddbridge.o
+
 obj-$(CONFIG_DVB_OCTONET) += octonet.o

-ccflags-y += -Idrivers/media/dvb-frontends/
-ccflags-y += -Idrivers/media/tuners/
-
+#ccflags-y += -Idrivers/media/include/linux/
+#ccflags-y += -Idrivers/media/dvb-frontends/
+#ccflags-y += -Idrivers/media/tuners/
--- a/ddbridge/Makefile.kernel
+++ b/ddbridge/Makefile.kernel
@@ -3,7 +3,7 @@
 #

 ddbridge-objs = ddbridge-main.o ddbridge-hw.o ddbridge-i2c.o ddbridge-ns.o ddbridge-modulator.o ddbridge-core.o ddbridge-io.o ddbridge-ci.o ddbridge-max.o ddbridge-mci.o ddbridge-sx8.o ddbridge-m4.o dvb_netstream.o
-octonet-objs = octonet-main.o ddbridge-hw.o ddbridge-i2c.o ddbridge-ns.o ddbridge-core.o ddbridge-io.o ddbridge-ci.o ddbridge-max.o ddbridge-mci.o ddbridge-sx8.o ddbridge-m4.o dvb_netstream.o
+octonet-objs = octonet-main.o ddbridge-hw.o ddbridge-i2c.o ddbridge-ns.o ddbridge-modulator.o ddbridge-core.o ddbridge-io.o ddbridge-ci.o ddbridge-max.o ddbridge-mci.o ddbridge-sx8.o ddbridge-m4.o dvb_netstream.o

 obj-$(CONFIG_DVB_DDBRIDGE) += ddbridge.o
 obj-$(CONFIG_DVB_OCTONET) += octonet.o
--- a/ddbridge/ddbridge-ci.c
+++ b/ddbridge/ddbridge-ci.c
@@ -32,7 +32,7 @@ static int wait_ci_ready(struct ddb_ci *ci)
 	ndelay(500);
 	do {
 		if (ddbreadl(ci->port->dev,
-			     CI_CONTROL(ci)) & CI_READY)
+			     CI_CONTROL(ci->nr)) & CI_READY)
 			break;
 		usleep_range(1, 2);
 		if ((--count) == 0)
@@ -50,7 +50,7 @@ static int read_attribute_mem(struct dvb_ca_en50221 *ca,
 	if (address > CI_BUFFER_SIZE)
 		return -1;
 	ddbwritel(ci->port->dev, CI_READ_CMD | (1 << 16) | address,
-		  CI_DO_READ_ATTRIBUTES(ci));
+		  CI_DO_READ_ATTRIBUTES(ci->nr));
 	wait_ci_ready(ci);
 	val = 0xff & ddbreadl(ci->port->dev, CI_BUFFER(ci->nr) + off);
 	return val;
@@ -62,7 +62,7 @@ static int write_attribute_mem(struct dvb_ca_en50221 *ca, int slot,
 	struct ddb_ci *ci = ca->data;

 	ddbwritel(ci->port->dev, CI_WRITE_CMD | (value << 16) | address,
-		  CI_DO_ATTRIBUTE_RW(ci));
+		  CI_DO_ATTRIBUTE_RW(ci->nr));
 	wait_ci_ready(ci);
 	return 0;
 }
@@ -75,10 +75,10 @@ static int read_cam_control(struct dvb_ca_en50221 *ca,
 	u32 res;

 	ddbwritel(ci->port->dev, CI_READ_CMD | address,
-		  CI_DO_IO_RW(ci));
+		  CI_DO_IO_RW(ci->nr));
 	ndelay(500);
 	do {
-		res = ddbreadl(ci->port->dev, CI_READDATA(ci));
+		res = ddbreadl(ci->port->dev, CI_READDATA(ci->nr));
 		if (res & CI_READY)
 			break;
 		usleep_range(1, 2);
@@ -94,7 +94,7 @@ static int write_cam_control(struct dvb_ca_en50221 *ca, int slot,
 	struct ddb_ci *ci = ca->data;

 	ddbwritel(ci->port->dev, CI_WRITE_CMD | (value << 16) | address,
-		  CI_DO_IO_RW(ci));
+		  CI_DO_IO_RW(ci->nr));
 	wait_ci_ready(ci);
 	return 0;
 }
@@ -104,15 +104,15 @@ static int slot_reset(struct dvb_ca_en50221 *ca, int slot)
 	struct ddb_ci *ci = ca->data;

 	ddbwritel(ci->port->dev, CI_POWER_ON,
-		  CI_CONTROL(ci));
+		  CI_CONTROL(ci->nr));
 	msleep(300);
 	ddbwritel(ci->port->dev, CI_POWER_ON | CI_RESET_CAM,
-		  CI_CONTROL(ci));
+		  CI_CONTROL(ci->nr));
 	ddbwritel(ci->port->dev, CI_ENABLE | CI_POWER_ON | CI_RESET_CAM,
-		  CI_CONTROL(ci));
+		  CI_CONTROL(ci->nr));
 	usleep_range(20, 25);
 	ddbwritel(ci->port->dev, CI_ENABLE | CI_POWER_ON,
-		  CI_CONTROL(ci));
+		  CI_CONTROL(ci->nr));
 	return 0;
 }

@@ -120,7 +120,7 @@ static int slot_shutdown(struct dvb_ca_en50221 *ca, int slot)
 {
 	struct ddb_ci *ci = ca->data;

-	ddbwritel(ci->port->dev, 0, CI_CONTROL(ci));
+	ddbwritel(ci->port->dev, 0, CI_CONTROL(ci->nr));
 	msleep(300);
 	return 0;
 }
@@ -128,17 +128,17 @@ static int slot_shutdown(struct dvb_ca_en50221 *ca, int slot)
 static int slot_ts_enable(struct dvb_ca_en50221 *ca, int slot)
 {
 	struct ddb_ci *ci = ca->data;
-	u32 val = ddbreadl(ci->port->dev, CI_CONTROL(ci));
+	u32 val = ddbreadl(ci->port->dev, CI_CONTROL(ci->nr));

 	ddbwritel(ci->port->dev, val | CI_BYPASS_DISABLE,
-		  CI_CONTROL(ci));
+		  CI_CONTROL(ci->nr));
 	return 0;
 }

 static int poll_slot_status(struct dvb_ca_en50221 *ca, int slot, int open)
 {
 	struct ddb_ci *ci = ca->data;
-	u32 val = ddbreadl(ci->port->dev, CI_CONTROL(ci));
+	u32 val = ddbreadl(ci->port->dev, CI_CONTROL(ci->nr));
 	int stat = 0;

 	if (val & CI_CAM_DETECT)
@@ -162,8 +162,6 @@ static struct dvb_ca_en50221 en_templ = {
 static void ci_attach(struct ddb_port *port)
 {
 	struct ddb_ci *ci;
-	const struct ddb_info *info = port->dev->link[port->lnr].info;
-	u32 off = info->ci_base ? info->ci_base : 0x400;

 	ci = kzalloc(sizeof(*ci), GFP_KERNEL);
 	if (!ci)
@@ -173,7 +171,6 @@ static void ci_attach(struct ddb_port *port)
 	port->en = &ci->en;
 	ci->port = port;
 	ci->nr = port->nr - 2;
-	ci->regs = DDB_LINK_TAG(port->lnr) | (off + 32 * ci->nr);
 }

 /* DuoFlex Dual CI support */
--- a/ddbridge/ddbridge-core.c
+++ b/ddbridge/ddbridge-core.c
@@ -370,7 +370,7 @@ static int dma_alloc(struct pci_dev *pdev, struct ddb_dma *dma, int dir)
 			if (!dma->vbuf[i])
 				return -ENOMEM;
 		}
-		if (((uintptr_t) dma->vbuf[i] & 0xfff))
+		if (((u64)dma->vbuf[i] & 0xfff))
 			dev_err(&pdev->dev, "DMA memory at %px not aligned!\n", dma->vbuf[i]);
 	}
 	return 0;
@@ -467,7 +467,7 @@ static void calc_con(struct ddb_output *output, u32 *con, u32 *con2, u32 flags)
 		gap = output->port->gap;
 		max_bitrate = 0;
 	}
-	if (dev->link[0].info->ci_mask && output->port->nr > 1) {
+	if (dev->link[0].info->type == DDB_OCTOPUS_CI && output->port->nr > 1) {
 		*con = 0x10c;
 		if (dev->link[0].ids.regmapid >= 0x10003 && !(flags & 1)) {
 			if (!(flags & 2)) {
@@ -534,9 +534,7 @@ static int ddb_output_start_unlocked(struct ddb_output *output)
 		ddbwritel(dev, 0, DMA_BUFFER_CONTROL(output->dma));
 	}
 	if (output->port->class == DDB_PORT_MOD) {
-#ifndef CONFIG_MACH_OCTONET
 		err = ddbridge_mod_output_start(output);
-#endif
 	} else {
 		if (output->port->input[0]->port->class == DDB_PORT_LOOP)
 			con = (1UL << 13) | 0x14;
@@ -580,11 +578,9 @@ static void ddb_output_stop_unlocked(struct ddb_output *output)
 {
 	struct ddb *dev = output->port->dev;

-#ifndef CONFIG_MACH_OCTONET
 	if (output->port->class == DDB_PORT_MOD)
 		ddbridge_mod_output_stop(output);
 	else
-#endif
 		ddbwritel(dev, 0, TS_CONTROL(output));
 	if (output->dma) {
 		ddbwritel(dev, 0, DMA_BUFFER_CONTROL(output->dma));
@@ -626,14 +622,12 @@ static void ddb_input_stop_unlocked(struct ddb_input *input)
 		input->dma->running = 0;
 		if (input->dma->stall_count)
 			dev_warn(input->port->dev->dev,
-				 "l%ui%u: DMA stalled %u times!\n",
-				 input->port->lnr, input->nr,
+				 "DMA stalled %u times!\n",
 				 input->dma->stall_count);
 		update_loss(input->dma);
 		if (input->dma->packet_loss > 1)
 			dev_warn(input->port->dev->dev,
-				 "l%ui%u: %u packets lost due to low DMA performance!\n",
-				 input->port->lnr, input->nr,
+				 "%u packets lost due to low DMA performance!\n",
 				 input->dma->packet_loss);
 	}
 }
@@ -1068,12 +1062,8 @@ static struct dvb_device dvbdev_ci = {
 static long mod_ioctl(struct file *file,
 		      unsigned int cmd, unsigned long arg)
 {
-#ifndef CONFIG_MACH_OCTONET
 	return ddb_dvb_usercopy(file, cmd, arg, ddbridge_mod_do_ioctl);
-#else
-	return 0;
-#endif
-	}
+}

 static const struct file_operations mod_fops = {
 	.owner   = THIS_MODULE,
@@ -1122,24 +1112,15 @@ static int dummy_read_status(struct dvb_frontend *fe, enum fe_status *status)
 static void dummy_release(struct dvb_frontend *fe)
 {
 	kfree(fe);
-#ifdef CONFIG_MEDIA_ATTACH
-	__module_get(THIS_MODULE);
-#endif
-}
-
-static enum dvbfe_algo dummy_algo(struct dvb_frontend *fe)
-{
-	return DVBFE_ALGO_HW;
 }

 static struct dvb_frontend_ops dummy_ops = {
-	.delsys = { SYS_DVBC_ANNEX_A },
+	.delsys = { SYS_DVBC_ANNEX_A, SYS_DVBS, SYS_DVBS2 },
 	.info = {
-		.name = "DUMMY DVB-C",
-		.frequency_stepsize_hz = 0,
-		.frequency_tolerance_hz	= 0,
-		.frequency_min_hz = 47000000,
-		.frequency_max_hz = 865000000,
+		.name = "DUMMY DVB-C/C2 DVB-T/T2",
+		.frequency_stepsize_hz = 166667,	/* DVB-T only */
+		.frequency_min_hz = 47000000,	/* DVB-T: 47125000 */
+		.frequency_max_hz = 865000000,	/* DVB-C: 862000000 */
 		.symbol_rate_min = 870000,
 		.symbol_rate_max = 11700000,
 		.caps = FE_CAN_QPSK | FE_CAN_QAM_16 | FE_CAN_QAM_32 |
@@ -1152,7 +1133,6 @@ static struct dvb_frontend_ops dummy_ops = {
 		FE_CAN_GUARD_INTERVAL_AUTO | FE_CAN_HIERARCHY_AUTO |
 		FE_CAN_RECOVER | FE_CAN_MUTE_TS | FE_CAN_2G_MODULATION
 	},
-	.get_frontend_algo = dummy_algo,
 	.release = dummy_release,
 	.read_status = dummy_read_status,
 };
@@ -1173,7 +1153,11 @@ static int demod_attach_dummy(struct ddb_input *input)
 {
 	struct ddb_dvb *dvb = &input->port->dvb[input->nr & 1];

+#if 0
+	dvb->fe = dvb_attach(dummy_attach);
+#else
 	dvb->fe = dummy_attach();
+#endif
 	return 0;
 }

@@ -1244,7 +1228,6 @@ static int demod_attach_stv0367dd(struct ddb_input *input)
 	return 0;
 }

-#ifdef CONFIG_DVB_DRXK
 static int tuner_attach_tda18271(struct ddb_input *input)
 {
 	struct i2c_adapter *i2c = &input->port->i2c->adap;
@@ -1263,7 +1246,6 @@ static int tuner_attach_tda18271(struct ddb_input *input)
 	}
 	return 0;
 }
-#endif

 static int tuner_attach_tda18212dd(struct ddb_input *input)
 {
@@ -1548,9 +1530,7 @@ static void dvb_input_detach(struct ddb_input *input)
 			dvb_netstream_release(&dvb->dvbns);
 		fallthrough;
 	case 0x20:
-#ifdef CONFIG_DVB_NET
 		dvb_net_release(&dvb->dvbnet);
-#endif
 		fallthrough;
 	case 0x12:
 		dvbdemux->dmx.remove_frontend(&dvbdemux->dmx,
@@ -1596,7 +1576,8 @@ static int dvb_register_adapters(struct ddb *dev)
 	}

 	if (adapter_alloc >= 3 || dev->link[0].info->type == DDB_MOD ||
-	    dev->link[0].info->type == DDB_OCTONET) {
+	    dev->link[0].info->type == DDB_OCTONET ||
+	    dev->link[0].info->type == DDB_OCTOPRO) {
 		port = &dev->port[0];
 		adap = port->dvb[0].adap;
 		ret = dvb_register_adapter(adap, "DDBridge", THIS_MODULE,
@@ -1728,11 +1709,9 @@ static int dvb_input_attach(struct ddb_input *input)
 		return ret;
 	dvb->attached = 0x12;

-#ifdef CONFIG_DVB_NET
 	ret = dvb_net_init(adap, &dvb->dvbnet, dvb->dmxdev.demux);
 	if (ret < 0)
 		return ret;
-#endif
 	dvb->attached = 0x20;

 	if (input->port->dev->ns_num) {
@@ -1838,9 +1817,6 @@ static int dvb_input_attach(struct ddb_input *input)
 		break;
 	case DDB_TUNER_MCI_SX8:
 	case DDB_TUNER_MCI_M4:
-	case DDB_TUNER_MCI_M8:
-	case DDB_TUNER_MCI_M8A:
-	case DDB_TUNER_MCI_M2:
 		if (ddb_fe_attach_mci(input, port->type) < 0)
 			return -ENODEV;
 		break;
@@ -2104,7 +2080,7 @@ static void ddb_port_probe(struct ddb_port *port)
 		return;
 	}

-	if (port->nr == 1 && link->info->ci_mask &&
+	if (port->nr == 1 && link->info->type == DDB_OCTOPUS_CI &&
 	    link->info->i2c_mask == 1) {
 		port->name = "NO TAB";
 		port->class = DDB_PORT_NONE;
@@ -2132,16 +2108,15 @@ static void ddb_port_probe(struct ddb_port *port)
 		port->name = "DUAL MCI";
 		port->type_name = "MCI";
 		port->class = DDB_PORT_TUNER;
-		port->type = link->info->mci_type;
+		port->type = DDB_TUNER_MCI + link->info->mci_type;
 		return;
 	}

-	if (port->nr > 1 && (link->info->ci_mask & (1 << port->nr))) {
+	if (port->nr > 1 && link->info->type == DDB_OCTOPUS_CI) {
 		port->name = "CI internal";
 		port->type_name = "INTERNAL";
 		port->class = DDB_PORT_CI;
 		port->type = DDB_CI_INTERNAL;
-		return;
 	}

 	if (!port->i2c)
@@ -2673,6 +2648,10 @@ static void ddb_ports_init(struct ddb *dev)
 		if (!rm)
 			continue;
 		ports = info->port_num;
+		if ((l == 0) && (info->type == DDB_MOD) &&
+		    (dev->link[0].ids.revision == 1)) {
+			ports = ddbreadl(dev, 0x260) >> 24;
+		}
 		for (i = 0; i < ports; i++, p++) {
 			port = &dev->port[p];
 			port->dev = dev;
@@ -2719,38 +2698,32 @@ static void ddb_ports_init(struct ddb *dev)
 				continue;
 			
 			switch (info->type) {
-			case DDB_OCTONET:
-			case DDB_OCTOPUS:
-				if (info->ci_mask & (1 << i)) {
+			case DDB_OCTOPUS_CI:
+				if (i >= 2) {
 					ddb_input_init(port, 2 + i, 0, 2 + i);
 					ddb_input_init(port, 4 + i, 1, 4 + i);
 					ddb_output_init(port, i);
 					break;
 				}
-				ddb_output_init(port, i);
-				ddb_input_init(port, 2 * i, 0, 2 * p);
-				ddb_input_init(port, 2 * i + 1, 1, 2 * p + 1);
+				fallthrough;
+			case DDB_OCTONET:
+			case DDB_OCTOPUS:
+			case DDB_OCTOPRO:
+				ddb_input_init(port, 2 * i, 0, 2 * i);
+				ddb_input_init(port, 2 * i + 1, 1, 2 * i + 1);
 				ddb_output_init(port, i);
 				break;
 			case DDB_OCTOPUS_MAX:
 			case DDB_OCTOPUS_MAX_CT:
 			case DDB_OCTOPUS_MCI:
-				if (info->ci_mask & (1 << i)) {
-					ddb_input_init(port, 2 + i, 0, 2 + i);
-					ddb_input_init(port, 4 + i, 1, 4 + i);
-					ddb_output_init(port, i);
-					break;
-				}
 				ddb_input_init(port, 2 * i, 0, 2 * p);
 				ddb_input_init(port, 2 * i + 1, 1, 2 * p + 1);
 				break;
 			case DDB_MOD:
-#ifndef CONFIG_MACH_OCTONET
 				ddb_output_init(port, i);
 				ddb_irq_set(dev, 0, i + rm->irq_base_rate,
 					    &ddbridge_mod_rate_handler,
 					    &dev->output[i]);
-#endif
 				break;
 			default:
 				break;
@@ -3475,11 +3448,7 @@ static const struct file_operations ddb_fops = {
 #if (KERNEL_VERSION(3, 4, 0) > LINUX_VERSION_CODE)
 static char *ddb_devnode(struct device *device, mode_t *mode)
 #else
-#if (KERNEL_VERSION(6, 2, 0) > LINUX_VERSION_CODE)
 static char *ddb_devnode(struct device *device, umode_t *mode)
-#else
-static char *ddb_devnode(const struct device *device, umode_t *mode)
-#endif
 #endif
 {
 	struct ddb *dev = dev_get_drvdata(device);
@@ -4056,9 +4025,7 @@ static struct device_attribute ddb_attrs_fanspeed[] = {

 static struct class ddb_class = {
 	.name		= "ddbridge",
-#if (KERNEL_VERSION(6, 4, 0) > LINUX_VERSION_CODE)
 	.owner          = THIS_MODULE,
-#endif
 	.devnode        = ddb_devnode,
 };

@@ -4462,41 +4429,6 @@ static int ddb_init_boards(struct ddb *dev)
 			     (link->ids.revision == 1)))
 				mci_init(link);
 		}
-		if (l)
-			continue;
-		if (dev->link[0].info->type == DDB_MOD &&
-		    dev->link[0].info->version == 2) {
-			u32 lic = ddbreadl(dev, 0x1c) & 7;
-
-			if (dev->link[0].ids.revision == 1)
-				lic = ddbreadl(dev, 0x260) >> 24;
-
-			switch (lic) {
-			case 0:
-			case 4:
-				dev->link[0].info =
-					get_ddb_info(0xdd01, 0x0210, 0xdd01, 0x0000);
-				break;
-			case 1:
-			case 8:
-				dev->link[0].info =
-					get_ddb_info(0xdd01, 0x0210, 0xdd01, 0x0003);
-				break;
-			case 2:
-			case 24:
-				dev->link[0].info =
-					get_ddb_info(0xdd01, 0x0210, 0xdd01, 0x0001);
-				break;
-			case 3:
-			case 16:
-				dev->link[0].info =
-					get_ddb_info(0xdd01, 0x0210, 0xdd01, 0x0002);
-				break;
-			default:
-				break;
-			}
-			dev_info(dev->dev, "Modulator channels: %u\n", dev->link[0].info->port_num);
-		}
 	}
 	return 0;
 }
@@ -4523,10 +4455,8 @@ int ddb_init(struct ddb *dev)
 	if (ddb_i2c_init(dev) < 0)
 		goto fail;
 	ddb_ports_init(dev);
-#ifndef CONFIG_MACH_OCTONET
 	if (dev->link[0].info->type == DDB_MOD)
 		ddbridge_mod_init(dev);
-#endif
 	if (ddb_buffers_alloc(dev) < 0) {
 		dev_info(dev->dev,
 			 "Could not allocate buffer memory\n");
--- a/ddbridge/ddbridge-hw.c
+++ b/ddbridge/ddbridge-hw.c
@@ -246,6 +246,7 @@ static const struct ddb_regmap octopus_map = {
 	.odma = &octopus_odma,
 	.odma_buf = &octopus_odma_buf,
 	.input = &octopus_input,
+
 	.output = &octopus_output,
 };

@@ -462,25 +463,23 @@ static const struct ddb_info ddb_satixs2v3 = {
 };

 static const struct ddb_info ddb_ci = {
-	.type     = DDB_OCTOPUS,
+	.type     = DDB_OCTOPUS_CI,
 	.name     = "Digital Devices Octopus CI",
 	.regmap   = &octopus_map,
 	.port_num = 4,
 	.i2c_mask = 0x03,
-	.ci_mask  = 0x0c,
 };

 static const struct ddb_info ddb_cis = {
-	.type     = DDB_OCTOPUS,
+	.type     = DDB_OCTOPUS_CI,
 	.name     = "Digital Devices Octopus CI single",
 	.regmap   = &octopus_map,
 	.port_num = 3,
 	.i2c_mask = 0x03,
-	.ci_mask  = 0x04,
 };

 static const struct ddb_info ddb_ci_s2_pro = {
-	.type     = DDB_OCTOPUS,
+	.type     = DDB_OCTOPUS_CI,
 	.name     = "Digital Devices Octopus CI S2 Pro",
 	.regmap   = &octopus_map,
 	.port_num = 4,
@@ -488,11 +487,10 @@ static const struct ddb_info ddb_ci_s2_pro = {
 	.board_control   = 2,
 	.board_control_2 = 4,
 	.hw_min    = 0x010007,
-	.ci_mask   = 0x0c,
 };

 static const struct ddb_info ddb_ci_s2_pro_a = {
-	.type     = DDB_OCTOPUS,
+	.type     = DDB_OCTOPUS_CI,
 	.name     = "Digital Devices Octopus CI S2 Pro Advanced",
 	.regmap   = &octopus_map,
 	.port_num = 4,
@@ -500,7 +498,6 @@ static const struct ddb_info ddb_ci_s2_pro_a = {
 	.board_control   = 2,
 	.board_control_2 = 4,
 	.hw_min    = 0x010007,
-	.ci_mask  = 0x0c,
 };

 static const struct ddb_info ddb_dvbct = {
@@ -573,17 +570,6 @@ static const struct ddb_info ddb_mod_fsm_4 = {
 	.lostlock_irq = 9,
 };

-static const struct ddb_info ddb_mod_fsm = {
-	.type     = DDB_MOD,
-	.name     = "Digital Devices DVB-C FSM",
-	.version  = 2,
-	.regmap   = &octopus_mod_2_map,
-	.port_num = 0,
-	.temp_num = 1,
-	.tempmon_irq = 8,
-	.lostlock_irq = 9,
-};
-
 static const struct ddb_info ddb_sdr_atv = {
 	.type     = DDB_MOD,
 	.name     = "Digital Devices SDR ATV",
@@ -619,11 +605,29 @@ static const struct ddb_info ddb_sdr_dvbt = {
 	.name     = "Digital Devices DVBT",
 	.version  = 18,
 	.regmap   = &octopus_sdr_map,
-	.port_num = 14,
+	.port_num = 16,
 	.temp_num = 1,
 	.tempmon_irq = 8,
 };

+static const struct ddb_info ddb_octopro_hdin = {
+	.type     = DDB_OCTOPRO_HDIN,
+	.name     = "Digital Devices OctopusNet Pro HDIN",
+	.regmap   = &octopro_hdin_map,
+	.port_num = 10,
+	.i2c_mask = 0x3ff,
+	.mdio_base = 0x10020,
+};
+
+static const struct ddb_info ddb_octopro = {
+	.type     = DDB_OCTOPRO,
+	.name     = "Digital Devices OctopusNet Pro",
+	.regmap   = &octopro_map,
+	.port_num = 10,
+	.i2c_mask = 0x3ff,
+	.mdio_base = 0x10020,
+};
+
 static const struct ddb_info ddb_s2_48 = {
 	.type     = DDB_OCTOPUS_MAX,
 	.name     = "Digital Devices MAX S8 4/8",
@@ -632,7 +636,6 @@ static const struct ddb_info ddb_s2_48 = {
 	.i2c_mask = 0x01,
 	.board_control = 1,
 	.tempmon_irq = 24,
-	.lnb_base = 0x400,
 };

 static const struct ddb_info ddb_ct2_8 = {
@@ -705,9 +708,8 @@ static const struct ddb_info ddb_s2x_48 = {
 	.i2c_mask = 0x00,
 	.tempmon_irq = 24,
 	.mci_ports = 4,
-	.mci_type = DDB_TUNER_MCI_SX8,
+	.mci_type = 0,
 	.temp_num = 1,
-	.lnb_base = 0x400,
 };

 static const struct ddb_info ddb_s2x_48_b = {
@@ -718,9 +720,8 @@ static const struct ddb_info ddb_s2x_48_b = {
 	.i2c_mask = 0x00,
 	.tempmon_irq = 24,
 	.mci_ports = 4,
-	.mci_type = DDB_TUNER_MCI_SX8,
+	.mci_type = 0,
 	.temp_num = 1,
-	.lnb_base = 0x400,
 };

 static const struct ddb_info ddb_m4 = {
@@ -731,48 +732,8 @@ static const struct ddb_info ddb_m4 = {
 	.i2c_mask = 0x00,
 	.tempmon_irq = 24,
 	.mci_ports = 2,
-	.mci_type = DDB_TUNER_MCI_M4,
+	.mci_type = 1,
 	.temp_num = 1,
-	.lnb_base = 0x400,
-};
-
-static const struct ddb_info ddb_m8 = {
-	.type     = DDB_OCTOPUS_MCI,
-	.name     = "Digital Devices MAX M8",
-	.regmap   = &octopus_mci_map,
-	.port_num = 4,
-	.i2c_mask = 0x00,
-	.tempmon_irq = 24,
-	.mci_ports = 4,
-	.mci_type = DDB_TUNER_MCI_M8,
-	.temp_num = 1,
-	.lnb_base = 0x400,
-};
-
-static const struct ddb_info ddb_m8a = {
-	.type     = DDB_OCTOPUS_MCI,
-	.name     = "Digital Devices MAX M8A",
-	.regmap   = &octopus_mci_map,
-	.port_num = 4,
-	.tempmon_irq = 24,
-	.mci_ports = 4,
-	.mci_type = DDB_TUNER_MCI_M8A,
-	.temp_num = 1,
-	.lnb_base = 0x400,
-};
-
-static const struct ddb_info ddb_ci_m2 = {
-	.type     = DDB_OCTOPUS_MCI,
-	.name     = "Digital Devices Octopus CI M2",
-	.regmap   = &octopus_mci_map,
-	.port_num = 4,
-	.tempmon_irq = 24,
-	.mci_ports = 1,
-	.mci_type = DDB_TUNER_MCI_M2,
-	.temp_num = 1,
-	.ci_mask  = 0x0c,
-	.ci_base  = 0x400,
-	.lnb_base = 0x480,
 };

 /****************************************************************************/
@@ -905,17 +866,13 @@ static const struct ddb_device_id ddb_device_ids[] = {
 	DDB_DEVID(0x0012, 0x0042, ddb_ci),
 	DDB_DEVID(0x0013, 0x0043, ddb_ci_s2_pro),
 	DDB_DEVID(0x0013, 0x0044, ddb_ci_s2_pro_a),
-	DDB_DEVID(0x0014, 0x0045, ddb_ci_m2),
 	DDB_DEVID(0x0020, 0x0012, ddb_gtl_mini),
-	DDB_DEVID(0x0022, 0x0052, ddb_m8),
-	DDB_DEVID(0x0024, 0x0053, ddb_m8a),

 	/* Modulators */
 	DDB_DEVID(0x0201, 0x0001, ddb_mod),
 	DDB_DEVID(0x0201, 0x0002, ddb_mod),
 	DDB_DEVID(0x0201, 0x0004, ddb_mod_4),  /* dummy entry ! */
 	DDB_DEVID(0x0203, 0x0001, ddb_mod),
-	DDB_DEVID(0x0210, 0x0004, ddb_mod_fsm), /* dummy entry ! */
 	DDB_DEVID(0x0210, 0x0000, ddb_mod_fsm_4), /* dummy entry ! */
 	DDB_DEVID(0x0210, 0x0001, ddb_mod_fsm_24),
 	DDB_DEVID(0x0210, 0x0002, ddb_mod_fsm_16),
@@ -924,6 +881,15 @@ static const struct ddb_device_id ddb_device_ids[] = {
 	DDB_DEVID(0x0221, 0x0001, ddb_sdr_iq),
 	DDB_DEVID(0x0222, 0x0001, ddb_sdr_dvbt),
 	DDB_DEVID(0x0223, 0x0001, ddb_sdr_iq2),
+	DDB_DEVID(0xffff, 0xffff, ddb_sdr_iq2),
+
+	/* testing on OctopusNet Pro */
+	DDB_DEVID(0x0320, 0xffff, ddb_octopro_hdin),
+	DDB_DEVID(0x0321, 0xffff, ddb_none),
+	DDB_DEVID(0x0322, 0xffff, ddb_octopro),
+	DDB_DEVID(0x0323, 0xffff, ddb_none),
+	DDB_DEVID(0x0328, 0xffff, ddb_none),
+	DDB_DEVID(0x0329, 0xffff, ddb_octopro_hdin),

 	DDB_DEVID(0xffff, 0xffff, ddb_none),
 };
--- a/ddbridge/ddbridge-m4.c
+++ b/ddbridge/ddbridge-m4.c
@@ -72,12 +72,11 @@ static int search_s2(struct dvb_frontend *fe)
 	cmd.dvbs2_search.retry = 0;
 	cmd.dvbs2_search.frequency = p->frequency * 1000;
 	cmd.dvbs2_search.symbol_rate = p->symbol_rate;
-	cmd.dvbs2_search.scrambling_sequence_index =
-		p->scrambling_sequence_index;
+	cmd.dvbs2_search.scrambling_sequence_index = 0; //p->scrambling_sequence_index;
 	if (p->stream_id != NO_STREAM_ID_FILTER)
 		cmd.dvbs2_search.input_stream_id = p->stream_id;
-	cmd.tuner = state->mci.tuner;
-	cmd.demod = state->mci.demod;
+	cmd.tuner = state->mci.nr;
+	cmd.demod = state->mci.tuner;
 	cmd.output = state->mci.nr;

 	stat = ddb_mci_cmd(&state->mci, &cmd, NULL);
@@ -405,7 +404,7 @@ static int read_status(struct dvb_frontend *fe, enum fe_status *status)
 	ddb_mci_get_strength(fe);
 	if (res.status == MCI_DEMOD_WAIT_SIGNAL)
 		*status = 0x01;
-	else if (res.status == MX_DEMOD_WAIT_TS)
+	else if (res.status == M4_DEMOD_WAIT_TS)
 		*status = 0x03;
 	else if (res.status == MCI_DEMOD_TIMEOUT)
 		*status = FE_TIMEDOUT;
@@ -457,9 +456,6 @@ static void release(struct dvb_frontend *fe)
 		kfree(mci_base);
 	}
 	kfree(state);
-#ifdef CONFIG_MEDIA_ATTACH
-	__module_get(THIS_MODULE);
-#endif
 }

 static enum dvbfe_algo get_algo(struct dvb_frontend *fe)
@@ -529,134 +525,7 @@ static struct mci_cfg ddb_max_m4_cfg = {
 	.base_init = base_init,
 };

-static struct dvb_frontend_ops m_ops = {
-	.delsys = { SYS_DVBC_ANNEX_A, SYS_DVBC_ANNEX_B, SYS_DVBC_ANNEX_C,
-		    SYS_ISDBC, 
-		    SYS_DVBT, SYS_DVBT2, SYS_ISDBT,
-		    SYS_DVBS, SYS_DVBS2, SYS_ISDBS, },
-	.info = {
-		.name = "M_AS",
-		.frequency_min_hz = 47125000,	/* DVB-T: 47125000 */
-		.frequency_max_hz = 2150000000,	/* DVB-C: 862000000 */
-		.symbol_rate_min = 100000,
-		.symbol_rate_max = 100000000,
-		.frequency_stepsize_hz	= 0,
-		.frequency_tolerance_hz	= 0,
-		.caps = FE_CAN_QPSK | FE_CAN_QAM_16 | FE_CAN_QAM_32 |
-		FE_CAN_QAM_64 | FE_CAN_QAM_128 | FE_CAN_QAM_256 |
-		FE_CAN_QAM_AUTO |
-		FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
-		FE_CAN_FEC_4_5 |
-		FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |
-		FE_CAN_TRANSMISSION_MODE_AUTO |
-		FE_CAN_GUARD_INTERVAL_AUTO | FE_CAN_HIERARCHY_AUTO |
-		FE_CAN_RECOVER | FE_CAN_MUTE_TS | FE_CAN_2G_MODULATION
-	},
-	.release                        = release,
-	.get_frontend_algo              = get_algo,
-	.get_frontend                   = get_frontend,
-	.read_status                    = read_status,
-	.tune                           = tune,
-	.sleep                          = sleep,
-};
-
-static struct mci_cfg ddb_max_m_cfg = {
-	.type = 0,
-	.fe_ops = &m_ops,
-	.base_size = sizeof(struct m4_base),
-	.state_size = sizeof(struct m4),
-	.init = init,
-	.base_init = base_init,
-};
-
-static struct dvb_frontend_ops m_s_ops = {
-	.delsys = { SYS_DVBS, SYS_DVBS2, SYS_ISDBS },
-	.info = {
-		.name = "M_S",
-		.frequency_min_hz = 47125000,	/* DVB-T: 47125000 */
-		.frequency_max_hz = 2150000000,	/* DVB-C: 862000000 */
-		.symbol_rate_min = 100000,
-		.symbol_rate_max = 100000000,
-		.frequency_stepsize_hz	= 0,
-		.frequency_tolerance_hz	= 0,
-		.caps = FE_CAN_QPSK | FE_CAN_QAM_16 | FE_CAN_QAM_32 |
-		FE_CAN_QAM_64 | FE_CAN_QAM_128 | FE_CAN_QAM_256 |
-		FE_CAN_QAM_AUTO |
-		FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
-		FE_CAN_FEC_4_5 |
-		FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |
-		FE_CAN_TRANSMISSION_MODE_AUTO |
-		FE_CAN_GUARD_INTERVAL_AUTO | FE_CAN_HIERARCHY_AUTO |
-		FE_CAN_RECOVER | FE_CAN_MUTE_TS | FE_CAN_2G_MODULATION
-	},
-	.release                        = release,
-	.get_frontend_algo              = get_algo,
-	.get_frontend                   = get_frontend,
-	.read_status                    = read_status,
-	.tune                           = tune,
-	.sleep                          = sleep,
-};
-
-static struct mci_cfg ddb_max_m_s_cfg = {
-	.type = 0,
-	.fe_ops = &m_s_ops,
-	.base_size = sizeof(struct m4_base),
-	.state_size = sizeof(struct m4),
-	.init = init,
-	.base_init = base_init,
-};
-
-static struct dvb_frontend_ops m_a_ops = {
-	.delsys = { SYS_DVBC_ANNEX_A, SYS_DVBC_ANNEX_B, SYS_DVBC_ANNEX_C,
-		    SYS_ISDBC, 
-		    SYS_DVBT, SYS_DVBT2, SYS_ISDBT,
-	},
-	.info = {
-		.name = "M_A",
-		.frequency_min_hz = 47125000,	/* DVB-T: 47125000 */
-		.frequency_max_hz = 2150000000,	/* DVB-C: 862000000 */
-		.symbol_rate_min = 100000,
-		.symbol_rate_max = 100000000,
-		.frequency_stepsize_hz	= 0,
-		.frequency_tolerance_hz	= 0,
-		.caps = FE_CAN_QPSK | FE_CAN_QAM_16 | FE_CAN_QAM_32 |
-		FE_CAN_QAM_64 | FE_CAN_QAM_128 | FE_CAN_QAM_256 |
-		FE_CAN_QAM_AUTO |
-		FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
-		FE_CAN_FEC_4_5 |
-		FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |
-		FE_CAN_TRANSMISSION_MODE_AUTO |
-		FE_CAN_GUARD_INTERVAL_AUTO | FE_CAN_HIERARCHY_AUTO |
-		FE_CAN_RECOVER | FE_CAN_MUTE_TS | FE_CAN_2G_MODULATION
-	},
-	.release                        = release,
-	.get_frontend_algo              = get_algo,
-	.get_frontend                   = get_frontend,
-	.read_status                    = read_status,
-	.tune                           = tune,
-	.sleep                          = sleep,
-};
-
-static struct mci_cfg ddb_max_m_a_cfg = {
-	.type = 0,
-	.fe_ops = &m_a_ops,
-	.base_size = sizeof(struct m4_base),
-	.state_size = sizeof(struct m4),
-	.init = init,
-	.base_init = base_init,
-};
-
-static struct mci_cfg *ddb_max_cfgs [] = {
-	&ddb_max_m4_cfg,
-	&ddb_max_m_a_cfg,
-	&ddb_max_m_s_cfg,
-	&ddb_max_m_cfg,
-};
-
-struct dvb_frontend *ddb_mx_attach(struct ddb_input *input, int nr, int tuner, int type)
+struct dvb_frontend *ddb_m4_attach(struct ddb_input *input, int nr, int tuner)
 {
-	return ddb_mci_attach(input, ddb_max_cfgs[type], nr, tuner);
+	return ddb_mci_attach(input, &ddb_max_m4_cfg, nr, tuner);
 }
-
-EXPORT_SYMBOL(ddb_mx_attach);
-
--- a/ddbridge/ddbridge-main.c
+++ b/ddbridge/ddbridge-main.c
@@ -84,7 +84,7 @@ int pci_irq_vector(struct pci_dev *dev, unsigned int nr)
 /****************************************************************************/
 /****************************************************************************/

-static void ddb_irq_disable(struct ddb *dev)
+static void __devexit ddb_irq_disable(struct ddb *dev)
 {
 	if (dev->link[0].info->regmap->irq_version == 2) {
 		ddbwritel(dev, 0x00000000, INTERRUPT_V2_CONTROL);
@@ -114,7 +114,7 @@ static void __devexit ddb_msi_exit(struct ddb *dev)
 #endif
 }

-static void ddb_irq_exit(struct ddb *dev)
+static void __devexit ddb_irq_exit(struct ddb *dev)
 {
 	ddb_irq_disable(dev);
 	if (dev->msi == 2)
@@ -283,17 +283,11 @@ static int __devinit ddb_probe(struct pci_dev *pdev,

 	pci_set_master(pdev);

-#if (KERNEL_VERSION(5, 18, 0) <= LINUX_VERSION_CODE)
-	if (dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)))
-		if (dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)))
-#else
 	if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {
 		pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
 	} else if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
 		pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
-	} else
-#endif
-		return -ENODEV;
+	} else return -ENODEV;

 	dev = vzalloc(sizeof(*dev));
 	if (!dev)
@@ -339,7 +333,7 @@ static int __devinit ddb_probe(struct pci_dev *pdev,
 		u32 min = dev->link[0].info->hw_min;

 		dev_err(dev->dev, "Update firmware to at least version %u.%u to ensure full functionality!\n",
-			(min & 0xff0000) >> 16, min & 0xffff);
+			 (min & 0xff0000) >> 16, min & 0xffff);
 	}

 	if (dev->link[0].info->ns_num) {
@@ -350,22 +344,45 @@ static int __devinit ddb_probe(struct pci_dev *pdev,
 	if (dev->link[0].info->type != DDB_MOD)
 		ddbwritel(dev, 0, DMA_BASE_WRITE);

-	if (dev->link[0].info->type == DDB_MOD &&
-	    dev->link[0].info->version <= 1) {
+	if (dev->link[0].info->type == DDB_MOD
+	    && dev->link[0].info->version <= 1) {
 		if (ddbreadl(dev, 0x1c) == 4)
 			dev->link[0].info =
 				get_ddb_info(0xdd01, 0x0201, 0xdd01, 0x0004);
 	}
+	if (dev->link[0].info->type == DDB_MOD
+	    && dev->link[0].info->version == 2) {
+		u32 lic = ddbreadl(dev, 0x1c) & 7;

-	if (dev->link[0].info->type == DDB_MOD &&
-	    dev->link[0].info->version == 2) {
 		if (dev->link[0].ids.revision == 1)
-			dev->link[0].info = get_ddb_info(0xdd01, 0x0210, 0xdd01, 0x0004);
-		else if ((ddbreadl(dev, 0x1c) & 7) != 7)
-			dev->link[0].info = get_ddb_info(0xdd01, 0x0210, 0xdd01, 0x0004);
-	}
+			lic = ddbreadl(dev, 0x260) >> 24;

-	dev_info(dev->dev, "%s\n", dev->link[0].info->name);
+		switch (lic) {
+		case 0:
+		case 4:
+			dev->link[0].info =
+				get_ddb_info(0xdd01, 0x0210, 0xdd01, 0x0000);
+			break;
+		case 1:
+		case 8:
+			dev->link[0].info =
+				get_ddb_info(0xdd01, 0x0210, 0xdd01, 0x0003);
+			break;
+		case 2:
+		case 24:
+			dev->link[0].info =
+				get_ddb_info(0xdd01, 0x0210, 0xdd01, 0x0001);
+			break;
+		case 3:
+		case 16:
+			dev->link[0].info =
+				get_ddb_info(0xdd01, 0x0210, 0xdd01, 0x0002);
+			break;
+		default:
+			break;
+		}
+	}
+	dev_info(dev->dev, "device name: %s\n", dev->link[0].info->name);
 	dev_info(dev->dev, "HW %08x REGMAP %08x FW %u.%u\n",
 		 dev->link[0].ids.hwid, dev->link[0].ids.regmapid,
 		 (dev->link[0].ids.hwid & 0xff0000) >> 16,
@@ -417,10 +434,7 @@ static const struct pci_device_id ddb_id_table[] __devinitconst = {
 	DDB_DEVICE_ANY(0x0011),
 	DDB_DEVICE_ANY(0x0012),
 	DDB_DEVICE_ANY(0x0013),
-	DDB_DEVICE_ANY(0x0014),
 	DDB_DEVICE_ANY(0x0020),
-	DDB_DEVICE_ANY(0x0022),
-	DDB_DEVICE_ANY(0x0024),
 	DDB_DEVICE_ANY(0x0201),
 	DDB_DEVICE_ANY(0x0203),
 	DDB_DEVICE_ANY(0x0210),
@@ -428,10 +442,17 @@ static const struct pci_device_id ddb_id_table[] __devinitconst = {
 	DDB_DEVICE_ANY(0x0221),
 	DDB_DEVICE_ANY(0x0222),
 	DDB_DEVICE_ANY(0x0223),
+	DDB_DEVICE_ANY(0x0320),
+	DDB_DEVICE_ANY(0x0321),
+	DDB_DEVICE_ANY(0x0322),
+	DDB_DEVICE_ANY(0x0323),
+	DDB_DEVICE_ANY(0x0328),
+	DDB_DEVICE_ANY(0x0329),
 	{0}
 };
 MODULE_DEVICE_TABLE(pci, ddb_id_table);

+
 static pci_ers_result_t ddb_pci_slot_reset(struct pci_dev *dev)
 {
 	pr_info("pci_slot_reset\n");
@@ -471,6 +492,7 @@ static const struct pci_error_handlers ddb_error = {
 	.resume = ddb_pci_resume,
 };

+
 static struct pci_driver ddb_pci_driver = {
 	.name        = "ddbridge",
 	.id_table    = ddb_id_table,
--- a/ddbridge/ddbridge-max.c
+++ b/ddbridge/ddbridge-max.c
@@ -28,10 +28,6 @@

 /* MAX LNB interface related module parameters */

-static int delmode;
-module_param(delmode, int, 0444);
-MODULE_PARM_DESC(delmode, "frontend delivery system mode");
-
 static int fmode;
 module_param(fmode, int, 0444);
 MODULE_PARM_DESC(fmode, "frontend emulation mode");
@@ -53,12 +49,11 @@ MODULE_PARM_DESC(no_voltage, "Do not enable voltage on LNBH (will also disable 2
 static int lnb_command(struct ddb *dev, u32 link, u32 lnb, u32 cmd)
 {
 	u32 c, v = 0, tag = DDB_LINK_TAG(link);
-	u32 base = dev->link[link].info->lnb_base;

 	v = LNB_TONE & (dev->link[link].lnb.tone << (15 - lnb));
-	ddbwritel(dev, cmd | v, tag | base | LNB_CONTROL(lnb));
+	ddbwritel(dev, cmd | v, tag | LNB_CONTROL(lnb));
 	for (c = 0; c < 10; c++) {
-		v = ddbreadl(dev, tag | base | LNB_CONTROL(lnb));
+		v = ddbreadl(dev, tag | LNB_CONTROL(lnb));
 		if ((v & LNB_BUSY) == 0)
 			break;
 		msleep(20);
@@ -96,7 +91,6 @@ static int max_send_master_cmd(struct dvb_frontend *fe,
 	struct ddb *dev = port->dev;
 	struct ddb_dvb *dvb = &port->dvb[input->nr & 1];
 	u32 tag = DDB_LINK_TAG(port->lnr);
-	u32 base = dev->link[port->lnr].info->lnb_base;
 	int i;
 	u32 fmode = dev->link[port->lnr].lnb.fmode;

@@ -111,9 +105,9 @@ static int max_send_master_cmd(struct dvb_frontend *fe,
 		dvb->diseqc_send_master_cmd(fe, cmd);

 	mutex_lock(&dev->link[port->lnr].lnb.lock);
-	ddbwritel(dev, 0, tag | base | LNB_BUF_LEVEL(dvb->input));
+	ddbwritel(dev, 0, tag | LNB_BUF_LEVEL(dvb->input));
 	for (i = 0; i < cmd->msg_len; i++)
-		ddbwritel(dev, cmd->msg[i], tag | base | LNB_BUF_WRITE(dvb->input));
+		ddbwritel(dev, cmd->msg[i], tag | LNB_BUF_WRITE(dvb->input));
 	lnb_command(dev, port->lnr, dvb->input, LNB_CMD_DISEQC);
 	mutex_unlock(&dev->link[port->lnr].lnb.lock);
 	return 0;
@@ -123,12 +117,11 @@ static int lnb_send_diseqc(struct ddb *dev, u32 link, u32 input,
 			   struct dvb_diseqc_master_cmd *cmd)
 {
 	u32 tag = DDB_LINK_TAG(link);
-	u32 base = dev->link[link].info->lnb_base;
 	int i;

-	ddbwritel(dev, 0, tag | base | LNB_BUF_LEVEL(input));
+	ddbwritel(dev, 0, tag | LNB_BUF_LEVEL(input));
 	for (i = 0; i < cmd->msg_len; i++)
-		ddbwritel(dev, cmd->msg[i], tag | base | LNB_BUF_WRITE(input));
+		ddbwritel(dev, cmd->msg[i], tag | LNB_BUF_WRITE(input));
 	lnb_command(dev, link, input, LNB_CMD_DISEQC);
 	return 0;
 }
@@ -376,7 +369,6 @@ static int max_enable_high_lnb_voltage(struct dvb_frontend *fe, long arg)
 	struct ddb_port *port = input->port;
 	struct ddb *dev = port->dev;
 	u32 tag = DDB_LINK_TAG(port->lnr);
-	u32 base = dev->link[port->lnr].info->lnb_base;
 	struct ddb_dvb *dvb = &port->dvb[input->nr & 1];
 	u32 fmode = dev->link[port->lnr].lnb.fmode;

@@ -385,14 +377,14 @@ static int max_enable_high_lnb_voltage(struct dvb_frontend *fe, long arg)
 	default:
 	case 0:
 	case 3:
-		ddbwritel(dev, arg ? 0x34 : 0x01, tag | base | LNB_CONTROL(dvb->input));
+		ddbwritel(dev, arg ? 0x34 : 0x01, tag | LNB_CONTROL(dvb->input));
 		break;
 	case 1:
 	case 2:
-		ddbwritel(dev, arg ? 0x34 : 0x01, tag | base | LNB_CONTROL(0));
-		ddbwritel(dev, arg ? 0x34 : 0x01, tag | base | LNB_CONTROL(1));
-		ddbwritel(dev, arg ? 0x34 : 0x01, tag | base | LNB_CONTROL(2));
-		ddbwritel(dev, arg ? 0x34 : 0x01, tag | base | LNB_CONTROL(3));
+		ddbwritel(dev, arg ? 0x34 : 0x01, tag | LNB_CONTROL(0));
+		ddbwritel(dev, arg ? 0x34 : 0x01, tag | LNB_CONTROL(1));
+		ddbwritel(dev, arg ? 0x34 : 0x01, tag | LNB_CONTROL(2));
+		ddbwritel(dev, arg ? 0x34 : 0x01, tag | LNB_CONTROL(3));
 		break;
 	}
 	mutex_unlock(&dev->link[port->lnr].lnb.lock);
@@ -509,8 +501,7 @@ int ddb_fe_attach_mxl5xx(struct ddb_input *input)
 /* MAX MCI related functions */
 struct dvb_frontend *ddb_sx8_attach(struct ddb_input *input, int nr, int tuner,
 				    int (**fn_set_input)(struct dvb_frontend *fe, int input));
-struct dvb_frontend *ddb_mx_attach(struct ddb_input *input, int nr, int tuner, int type);
-
+struct dvb_frontend *ddb_m4_attach(struct ddb_input *input, int nr, int tuner);

 int ddb_fe_attach_mci(struct ddb_input *input, u32 type)
 {
@@ -528,46 +519,11 @@ int ddb_fe_attach_mci(struct ddb_input *input, u32 type)
 		if (fm >= 3)
 			tuner = 0;
 		dvb->fe = ddb_sx8_attach(input, demod, tuner, &dvb->set_input);
-		dvb->input = tuner;
 		break;
 	case DDB_TUNER_MCI_M4:
 		fm = 0;
-		dvb->fe = ddb_mx_attach(input, demod, tuner, 0);
-		dvb->input = tuner;
+		dvb->fe = ddb_m4_attach(input, demod, tuner);
 		break;
-	case DDB_TUNER_MCI_M8:
-		fm = 3;
-		dvb->fe = ddb_mx_attach(input, demod, tuner, 1);
-		dvb->input = 0;
-		break;
-	case DDB_TUNER_MCI_M8A:
-		fm = 3;
-		dvb->fe = ddb_mx_attach(input, demod, tuner, 2);
-		dvb->input = 0;
-		break;
-	case DDB_TUNER_MCI_M2:
-	{
-		u32 mode, mmode;
-		
-                // delmode: 0 - sat,sat  1-cable,cable/sat 
-		switch (delmode & 1) {
-		case 0:
-			mode = 2;
-			mmode = 2;
-			break;
-		case 1:
-			mode = 1;
-			mmode = demod ? 3 : 1;
-			break;
-		}
-		if (!demod)
-			ddb_mci_cmd_link_simple(link, MCI_CMD_SET_INPUT_CONFIG,
-						0xff, mode | (delmode & 0x10));
-		dvb->fe = ddb_mx_attach(input, demod, tuner, mmode);
-		dvb->input = tuner;
-		fm = 0;
-		break;
-	}
 	default:
 		return -EINVAL;
 	}
@@ -575,7 +531,7 @@ int ddb_fe_attach_mci(struct ddb_input *input, u32 type)
 		dev_err(dev->dev, "No MCI card found!\n");
 		return -ENODEV;
 	}
-	if (!input->nr || (input->nr < 4 && type != DDB_TUNER_MCI_M8)) {
+	if (input->nr < 4) {
 		lnb_command(dev, port->lnr, input->nr, LNB_CMD_INIT);
 		lnb_set_voltage(dev, port->lnr, input->nr, SEC_VOLTAGE_OFF);
 	}
@@ -588,10 +544,15 @@ int ddb_fe_attach_mci(struct ddb_input *input, u32 type)
 	dvb->fe->ops.diseqc_send_master_cmd = max_send_master_cmd;
 	dvb->fe->ops.diseqc_send_burst = max_send_burst;
 	dvb->fe->sec_priv = input;
-	if (type == DDB_TUNER_MCI_SX8) {
+	switch (type) {
+	case DDB_TUNER_MCI_M4:
+		break;
+	default:
 #ifndef KERNEL_DVB_CORE
 		dvb->fe->ops.set_input = max_set_input;
 #endif
+		break;
 	}
+	dvb->input = tuner;
 	return 0;
 }
--- a/ddbridge/ddbridge-mci.c
+++ b/ddbridge/ddbridge-mci.c
@@ -134,8 +134,6 @@ int ddb_mci_cmd_link(struct ddb_link *link,
 	struct mci_result res;
 	int stat;

-	if (!link->mci_ok)
-		return -EFAULT;
 	if (!result)
 		result = &res;
 	mutex_lock(&link->mci_lock);
@@ -152,17 +150,6 @@ int ddb_mci_cmd_link(struct ddb_link *link,
 	return stat;
 }

-int ddb_mci_cmd_link_simple(struct ddb_link *link, u8 command, u8 demod, u8 value)
-{
-	struct mci_command cmd;
-
-	memset(&cmd, 0, sizeof(cmd));
-	cmd.command = command;
-	cmd.demod = demod;
-	cmd.params8[0] = value;
-	return ddb_mci_cmd_link(link, &cmd, 0);
-}
-
 static void mci_handler(void *priv)
 {
 	struct ddb_link *link = (struct ddb_link *) priv;
@@ -307,8 +294,6 @@ void ddb_mci_proc_info(struct mci *mci, struct dtv_frontend_properties *p)

 	p->frequency =
 		mci->signal_info.dvbs2_signal_info.frequency;
-	p->symbol_rate =
-		mci->signal_info.dvbs2_signal_info.symbol_rate;
 	switch (p->delivery_system) {
 	default:
 	case SYS_DVBS:
@@ -353,8 +338,6 @@ void ddb_mci_proc_info(struct mci *mci, struct dtv_frontend_properties *p)
 		break;
 	}
 	case SYS_DVBC_ANNEX_A:
-		p->modulation =
-			mci->signal_info.dvbc_signal_info.constellation + 1;
 		break;
 	case SYS_DVBT:
 		break;
--- a/ddbridge/ddbridge-mci.h
+++ b/ddbridge/ddbridge-mci.h
@@ -96,13 +96,11 @@
 #define SX8_DEMOD_IQ_MODE        (1)
 #define SX8_DEMOD_WAIT_MATYPE    (3)

-#define MX_DEMOD_WAIT_TS         (6)
-#define MX_DEMOD_C2SCAN          (16)
+#define M4_DEMOD_WAIT_TS         (6)
+#define M4_DEMOD_C2SCAN          (16)

 #define MCI_STATUS_OK                 (0x00)
 #define MCI_STATUS_UNSUPPORTED        (0x80)
-#define MCI_STATUS_BUSY               (0xFA)
-#define MCI_STATUS_HARDWARE_ERROR     (0xFB)
 #define MCI_STATUS_INVALID_PARAMETER  (0xFC)
 #define MCI_STATUS_RETRY              (0xFD)
 #define MCI_STATUS_NOT_READY          (0xFE)
@@ -113,8 +111,6 @@
 #define MCI_CMD_GETSIGNALINFO    (0x03)
 //#define MCI_CMD_RFPOWER          (0x04)

-#define MCI_CMD_SET_INPUT_CONFIG  (0x05)
-
 #define MCI_CMD_SEARCH_DVBS     (0x10)
 #define MCI_CMD_SEARCH_ISDBS    (0x11)

@@ -127,9 +123,6 @@
 #define MCI_CMD_SEARCH_ISDBC    (0x25)
 #define MCI_CMD_SEARCH_J83B     (0x26)

-#define MCI_CMD_SEARCH_ATSC     (0x27)
-#define MCI_CMD_SEARCH_ATSC3    (0x28)
-
 #define MCI_CMD_GET_IQSYMBOL     (0x30)

 #define MCI_BANDWIDTH_UNKNOWN    (0)
@@ -147,45 +140,42 @@
 #define SX8_CMD_ENABLE_IQOUTPUT  (0x44)
 #define SX8_CMD_DISABLE_IQOUTPUT (0x45)

-#define MX_CMD_GET_L1INFO         (0x50)
-#define MX_CMD_GET_IDS            (0x51)
-#define MX_CMD_GET_DVBT_TPS       (0x52)
+#define M4_CMD_GET_L1INFO         (0x50)
+#define M4_CMD_GET_IDS            (0x51)
+#define M4_CMD_GET_DVBT_TPS       (0x52)
 #define MCI_CMD_GET_BBHEADER      (0x53)
-#define MX_CMD_GET_ISDBT_TMCC     (0x54)
-#define MX_CMD_GET_ISDBS_TMCC     (0x55)
-#define MX_CMD_GET_ISDBC_TSMF     (0x56)
+#define M4_CMD_GET_ISDBT_TMCC     (0x54)
+#define M4_CMD_GET_ISDBS_TMCC     (0x55)
+#define M4_CMD_GET_ISDBC_TSMF     (0x56)

-#define MX_CMD_GET_BBHEADER       (MCI_CMD_GET_BBHEADER)
+#define M4_CMD_GET_BBHEADER       (MCI_CMD_GET_BBHEADER)

-#define MX_L1INFO_SEL_PRE         (0)
-#define MX_L1INFO_SEL_DSINFO      (1)
-#define MX_L1INFO_SEL_PLPINFO     (2)
-#define MX_L1INFO_SEL_PLPINFO_C   (3)
-#define MX_L1INFO_SEL_SETID       (0x80)
+#define M4_L1INFO_SEL_PRE         (0)
+#define M4_L1INFO_SEL_DSINFO      (1)
+#define M4_L1INFO_SEL_PLPINFO     (2)
+#define M4_L1INFO_SEL_PLPINFO_C   (3)
+#define M4_L1INFO_SEL_SETID       (0x80)

 #define MCI_BANDWIDTH_EXTENSION  (0x80)   // currently used only for J83B in Japan

-#define MX_MODE_DVBSX            (2)
-#define MX_MODE_DVBC             (3)
-#define MX_MODE_DVBT             (4)
-#define MX_MODE_DVBT2            (5)
-#define MX_MODE_DVBC2            (6)
-#define MX_MODE_J83B             (7)
-#define MX_MODE_ISDBT            (8)
-#define MX_MODE_ISDBC            (9)
-#define MX_MODE_ISDBS            (10)
-#define MX_MODE_ISDBS3           (11)
-#define MX_MODE_ATSC             (12)
-#define MX_MODE_ATSC3            (13)
+#define M4_MODE_DVBSX            (2)
+#define M4_MODE_DVBC             (3)
+#define M4_MODE_DVBT             (4)
+#define M4_MODE_DVBT2            (5)
+#define M4_MODE_DVBC2            (6)
+#define M4_MODE_J83B             (7)
+#define M4_MODE_ISDBT            (8)
+#define M4_MODE_ISDBC            (9)
+#define M4_MODE_ISDBS            (10)

-#define MX_DVBC_CONSTELLATION_16QAM  (0)
-#define MX_DVBC_CONSTELLATION_32QAM  (1)
-#define MX_DVBC_CONSTELLATION_64QAM  (2)  // also valid for J83B and ISDB-C
-#define MX_DVBC_CONSTELLATION_128QAM (3)
-#define MX_DVBC_CONSTELLATION_256QAM (4)  // also valid for J83B and ISDB-C
+#define M4_DVBC_CONSTELLATION_16QAM  (0)
+#define M4_DVBC_CONSTELLATION_32QAM  (1)
+#define M4_DVBC_CONSTELLATION_64QAM  (2)  // also valid for J83B and ISDB-C
+#define M4_DVBC_CONSTELLATION_128QAM (3)
+#define M4_DVBC_CONSTELLATION_256QAM (4)  // also valid for J83B and ISDB-C

-#define MX_SIGNALINFO_FLAG_CHANGE (0x01)
-#define MX_SIGNALINFO_FLAG_EWS    (0x02)
+#define M4_SIGNALINFO_FLAG_CHANGE (0x01)
+#define M4_SIGNALINFO_FLAG_EWS    (0x02)

 #define SX8_ROLLOFF_35  0
 #define SX8_ROLLOFF_25  1
@@ -273,11 +263,8 @@
 #define MOD_QAM_ISDBC_64          (0x08)
 #define MOD_QAM_ISDBC_256         (0x09)

-#define CMD_GET_SERIALNUMBER      (0xF0)
-#define CMD_EXPORT_LICENSE        (0xF0)
-#define CMD_IMPORT_LICENSE        (0xF1)
-#define CMD_POWER_DOWN            (0xF2)
-#define CMD_POWER_UP              (0xF3)
+#define CMD_GET_SERIALNUMBER    (0xF0)
+#define CMD_EXPORT_LICENSE      (0xF0)

 struct mod_setup_channels {
 	u8   flags;
@@ -491,20 +478,6 @@ struct mci_command {
 		struct mod_setup_channels mod_setup_channels[4];
 		struct mod_setup_stream mod_setup_stream;
 		struct mod_setup_output mod_setup_output;
-
-		struct {
-			u8   Cmd;
-			u8   Offset;
-			u8   Length;
-			u8   Rsvd1;
-			u32  Rsvd2[2];
-			u8   Data[96];
-		} sx8_packet_filter;
-
-		struct {
-			u8   ID[8];
-			u8   LK[24];
-		} license;
 	};
 };

@@ -993,7 +966,6 @@ struct mci_cfg {

 int ddb_mci_cmd(struct mci *state, struct mci_command *command, struct mci_result *result);
 int ddb_mci_cmd_link(struct ddb_link *link, struct mci_command *command, struct mci_result *result);
-int ddb_mci_cmd_link_simple(struct ddb_link *link, u8 command, u8 demod, u8 value);
 int ddb_mci_get_status(struct mci *mci, struct mci_result *res);
 int ddb_mci_get_snr(struct dvb_frontend *fe);
 int ddb_mci_get_info(struct mci *mci);
--- a/ddbridge/ddbridge-modulator.c
+++ b/ddbridge/ddbridge-modulator.c
@@ -195,48 +195,6 @@ static int mod_calc_obitrate(struct ddb_mod *mod)
 	return 0;
 }

-static int mod_set_stream(struct ddb_output *output)
-{
-	struct ddb *dev = output->port->dev;
-	u32 stream = output->nr;
-	struct ddb_mod *mod = &dev->mod[output->nr];
-	struct ddb_link *link = &dev->link[0];
-	struct mci_result res;
-	u32 channel;
-	struct mci_command cmd = {
-		.mod_command = MOD_SETUP_STREAM,
-		.mod_channel = stream,
-		.mod_stream = stream,
-		.mod_setup_stream = {
-			.standard = MOD_STANDARD_DVBC_8,
-			.symbol_rate = mod->symbolrate,
-			.qam = {
-				.modulation = mod->modulation - 1,
-				.rolloff = 13,
-			}
-		},
-	};
-	if (dev->link[0].info->version != 2)
-		return 0;
-	if (dev->link[0].ids.revision != 1)
-		return 0;
-	if ((dev->link[0].ids.hwid & 0xffffff) < 9065)
-		return 0;
-	if (!mod->frequency && !mod->symbolrate && !mod->modulation)
-		return 0;
-
-	if (mod->frequency)
-		channel = (mod->frequency - 114000000) / 8000000;
-	if (!mod->symbolrate)
-		mod->symbolrate = 6900000;
-	if (!mod->modulation)
-		mod->modulation = 5;
-	cmd.mod_channel = channel;
-	cmd.mod_setup_stream.symbol_rate = mod->symbolrate;
-	cmd.mod_setup_stream.qam.modulation = mod->modulation - 1;
-	return ddb_mci_cmd_link(link, &cmd, &res);
-}
-
 static int mod_set_symbolrate(struct ddb_mod *mod, u32 srate)
 {
 	struct ddb *dev = mod->port->dev;
@@ -252,7 +210,6 @@ static int mod_set_symbolrate(struct ddb_mod *mod, u32 srate)
 	}
 	mod->symbolrate = srate;
 	mod_calc_obitrate(mod);
-	mod_set_stream(mod->port->output);
 	return 0;
 }

@@ -270,7 +227,6 @@ static int mod_set_modulation(struct ddb_mod *mod,
 		ddbwritel(dev, qamtab[modulation],
 			  CHANNEL_SETTINGS(mod->port->nr));
 	mod_calc_obitrate(mod);
-	mod_set_stream(mod->port->output);
 	return 0;
 }

@@ -285,7 +241,6 @@ static int mod_set_frequency(struct ddb_mod *mod, u32 frequency)
 	if ((freq < 114) || (freq > 874))
 		return -EINVAL;
 	mod->frequency = frequency;
-	mod_set_stream(mod->port->output);
 	return 0;
 }

@@ -375,19 +330,13 @@ int ddbridge_mod_output_start(struct ddb_output *output)
 		u32 LF = 9000000UL;
 		u32 d = gcd(KF, LF);
 		u32 checkLF;
-
-		if ((dev->link[0].ids.revision == 1)) {
-			if ((dev->link[0].info->version == 2)) {
-				if ((dev->link[0].ids.hwid & 0xffffff) >= 9065) {
-					mod->Control |= CHANNEL_CONTROL_ENABLE_DVB;
-					break;
-				}
-			} else {
-				mod->Control |= CHANNEL_CONTROL_ENABLE_DVB;
-				break;
-			}
+#if 0
+		if (dev->link[0].ids.revision == 1) {
+			mod->Control |= CHANNEL_CONTROL_ENABLE_DVB;
+				return -EINVAL;
+			break;
 		}
-
+#endif
 		ddbwritel(dev, mod->modulation - 1, CHANNEL_SETTINGS(Channel));
 		ddbwritel(dev, Output, CHANNEL_SETTINGS2(Channel));

@@ -694,7 +643,7 @@ static int mod_set_attenuator(struct ddb *dev, u32 Value)
 			.mod_stream = 0,
 			.mod_setup_output = {
 				.connector = MOD_CONNECTOR_F,
-				.num_channels = dev->link[0].info->port_num,
+				.num_channels = 24,
 				.unit = MOD_UNIT_DBUV,
 				.channel_power = 9000 - Value * 100,
 			},
@@ -1838,8 +1787,7 @@ int ddbridge_mod_do_ioctl(struct file *file, unsigned int cmd, void *parg)
 		(struct dtv_properties __user *) parg;
 	int i, ret = 0;

-	if (dev->link[0].info->version >= 16 &&
-	    (cmd != FE_SET_PROPERTY && cmd != IOCTL_DDB_MCI_CMD))
+	if (dev->link[0].info->version >= 16 && cmd != FE_SET_PROPERTY)
 		return -EINVAL;
 	mutex_lock(&dev->ioctl_mutex);
 	switch (cmd) {
@@ -2176,8 +2124,6 @@ int ddbridge_mod_init(struct ddb *dev)
 		case 1:
 			return mod_init_1(dev, 722000000);
 		case 2: /* FSM */
-			if ((dev->link[0].ids.hwid & 0xffffff) >= 9065)
-				return mod_init_2_1(dev, 114000000);
 			return mod_init_2(dev, 114000000);
 		case 16: /* PAL */
 			return mod_init_3(dev, 503250000);
--- a/ddbridge/ddbridge-regs.h
+++ b/ddbridge/ddbridge-regs.h
@@ -248,7 +248,8 @@

 /* ------------------------------------------------------------------------- */

-#define LNB_CONTROL(i)               ((i) * 0x20 + 0x00)
+#define LNB_BASE                     (0x400)
+#define LNB_CONTROL(i)               (LNB_BASE + (i) * 0x20 + 0x00)
 #define LNB_CMD   (7ULL <<  0)
 #define LNB_CMD_NOP    0
 #define LNB_CMD_INIT   1
@@ -259,31 +260,32 @@
 #define LNB_CMD_DISEQC 6
 #define LNB_CMD_SCIF   7

-#define LNB_BUSY  (1ULL << 4)
-#define LNB_TONE  (1ULL << 15)
+#define LNB_BUSY  BIT_ULL(4)
+#define LNB_TONE  BIT_ULL(15)

 #define LNB_INTERRUPT_BASE      4

-#define LNB_STATUS(i)                ((i) * 0x20 + 0x04)
-#define LNB_VOLTAGE(i)               ((i) * 0x20 + 0x08)
-#define LNB_CONFIG(i)                ((i) * 0x20 + 0x0c)
-#define LNB_BUF_LEVEL(i)             ((i) * 0x20 + 0x10)
-#define LNB_BUF_WRITE(i)             ((i) * 0x20 + 0x14)
+#define LNB_STATUS(i)                (LNB_BASE + (i) * 0x20 + 0x04)
+#define LNB_VOLTAGE(i)               (LNB_BASE + (i) * 0x20 + 0x08)
+#define LNB_CONFIG(i)                (LNB_BASE + (i) * 0x20 + 0x0c)
+#define LNB_BUF_LEVEL(i)             (LNB_BASE + (i) * 0x20 + 0x10)
+#define LNB_BUF_WRITE(i)             (LNB_BASE + (i) * 0x20 + 0x14)

-#define LNB_SETTING(i)               ((i) * 0x20 + 0x0c)
-#define LNB_FIFO_LEVEL(i)            ((i) * 0x20 + 0x10)
-#define LNB_RESET_FIFO(i)            ((i) * 0x20 + 0x10)
-#define LNB_WRITE_FIFO(i)            ((i) * 0x20 + 0x14)
+#define LNB_SETTING(i)               (LNB_BASE + (i) * 0x20 + 0x0c)
+#define LNB_FIFO_LEVEL(i)            (LNB_BASE + (i) * 0x20 + 0x10)
+#define LNB_RESET_FIFO(i)            (LNB_BASE + (i) * 0x20 + 0x10)
+#define LNB_WRITE_FIFO(i)            (LNB_BASE + (i) * 0x20 + 0x14)

 /* ------------------------------------------------------------------------- */
 /* CI Interface (only CI-Bridge) */

-#define CI_CONTROL(_ci)                 ((_ci)->regs + 0x00)
+#define CI_BASE                     (0x400)
+#define CI_CONTROL(i)               (CI_BASE + (i) * 32 + 0x00)

-#define CI_DO_ATTRIBUTE_RW(_ci)         ((_ci)->regs + 0x04)
-#define CI_DO_IO_RW(_ci)                ((_ci)->regs + 0x08)
-#define CI_READDATA(_ci)                ((_ci)->regs + 0x0c)
-#define CI_DO_READ_ATTRIBUTES(_ci)      ((_ci)->regs + 0x10)
+#define CI_DO_ATTRIBUTE_RW(i)       (CI_BASE + (i) * 32 + 0x04)
+#define CI_DO_IO_RW(i)              (CI_BASE + (i) * 32 + 0x08)
+#define CI_READDATA(i)              (CI_BASE + (i) * 32 + 0x0c)
+#define CI_DO_READ_ATTRIBUTES(i)    (CI_BASE + (i) * 32 + 0x10)

 #define CI_RESET_CAM                    (0x00000001)
 #define CI_POWER_ON                     (0x00000002)
@@ -303,8 +305,8 @@
 #define CI_READ_CMD                     (0x40000000)
 #define CI_WRITE_CMD                    (0x80000000)

-#define CI_BLOCKIO_SEND(_ci)            ((_ci)->regs + 0x14)
-#define CI_BLOCKIO_RECEIVE(_ci)         ((_ci)->regs + 0x18)
+#define CI_BLOCKIO_SEND(i)              (CI_BASE + (i) * 32 + 0x14)
+#define CI_BLOCKIO_RECEIVE(i)           (CI_BASE + (i) * 32 + 0x18)

 #define CI_BLOCKIO_SEND_COMMAND         (0x80000000)
 #define CI_BLOCKIO_SEND_COMPLETE_ACK    (0x40000000)
--- a/ddbridge/ddbridge-sx8.c
+++ b/ddbridge/ddbridge-sx8.c
@@ -117,9 +117,6 @@ static void release(struct dvb_frontend *fe)
 		kfree(mci_base);
 	}
 	kfree(state);
-#ifdef CONFIG_MEDIA_ATTACH
-	__module_get(THIS_MODULE);
-#endif
 }

 static int ddb_mci_tsconfig(struct mci *state, u32 config)
@@ -494,21 +491,18 @@ static int set_parameters(struct dvb_frontend *fe)
 		stop_iq(fe);
 		switch (p->modulation) {
 		case APSK_256:
-		case APSK_256_L:
 			mask = 0x7f;
 			break;
 		case APSK_128:
 			mask = 0x3f;
 			break;
 		case APSK_64:
-		case APSK_64_L:
 			mask = 0x1f;
 			break;
 		case APSK_32:
 			mask = 0x0f;
 			break;
 		case APSK_16:
-		case APSK_16_L:
 			mask = 0x07;
 			break;
 		default:
--- a/ddbridge/ddbridge.h
+++ b/ddbridge/ddbridge.h
@@ -147,10 +147,13 @@ struct ddb_info {
 	u32   type;
 #define DDB_NONE             0
 #define DDB_OCTOPUS          1
+#define DDB_OCTOPUS_CI       2
 #define DDB_MOD              3
 #define DDB_OCTONET          4
 #define DDB_OCTOPUS_MAX      5
 #define DDB_OCTOPUS_MAX_CT   6
+#define DDB_OCTOPRO          7
+#define DDB_OCTOPRO_HDIN     8
 #define DDB_OCTOPUS_MCI      9
 	u32   version;
 	char *name;
@@ -172,14 +175,11 @@ struct ddb_info {
 #define TS_QUIRK_ALT_OSC   8
 	u8    mci_ports;
 	u8    mci_type;
-	u8    ci_mask;

 	u32   tempmon_irq;
 	u32   lostlock_irq;
 	u32   mdio_base;
 	u32   hw_min;
-	u32   ci_base;
-	u32   lnb_base;
 	const struct ddb_regmap *regmap;
 };

@@ -247,7 +247,6 @@ struct ddb_ci {
 	struct dvb_ca_en50221  en;
 	struct ddb_port       *port;
 	u32                    nr;
-	u32                    regs;
 };

 struct ddb_io {
@@ -321,9 +320,6 @@ struct ddb_port {
 #define DDB_TUNER_MCI            48
 #define DDB_TUNER_MCI_SX8       (DDB_TUNER_MCI + 0)
 #define DDB_TUNER_MCI_M4        (DDB_TUNER_MCI + 1)
-#define DDB_TUNER_MCI_M8        (DDB_TUNER_MCI + 2)
-#define DDB_TUNER_MCI_M8A       (DDB_TUNER_MCI + 3)
-#define DDB_TUNER_MCI_M2        (DDB_TUNER_MCI + 4)

 	struct ddb_input      *input[2];
 	struct ddb_output     *output;
--- a/dvb-core/dmxdev.c
+++ b/dvb-core/dmxdev.c
@@ -1,9 +1,19 @@
-// SPDX-License-Identifier: LGPL-2.1-or-later
 /*
 * dmxdev.c - DVB demultiplexer device
 *
 * Copyright (C) 2000 Ralph Metzler & Marcus Metzler
 *		      for convergence integrated media GmbH
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
 */

 #define pr_fmt(fmt) "dmxdev: " fmt
@@ -359,23 +369,23 @@ static int dvb_dmxdev_set_buffer_size(struct dmxdev_filter *dmxdevfilter,
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0))
 static void dvb_dmxdev_filter_timeout(struct timer_list *t)
 {
-	struct dmxdev_filter *dmxdevfilter = from_timer(dmxdevfilter, t, timer);
-
-	dmxdevfilter->buffer.error = -ETIMEDOUT;
-	spin_lock_irq(&dmxdevfilter->dev->lock);
-	dmxdevfilter->state = DMXDEV_STATE_TIMEDOUT;
-	spin_unlock_irq(&dmxdevfilter->dev->lock);
-	wake_up(&dmxdevfilter->buffer.queue);
+        struct dmxdev_filter *dmxdevfilter = from_timer(dmxdevfilter, t, timer);
+	
+        dmxdevfilter->buffer.error = -ETIMEDOUT;
+        spin_lock_irq(&dmxdevfilter->dev->lock);
+        dmxdevfilter->state = DMXDEV_STATE_TIMEDOUT;
+        spin_unlock_irq(&dmxdevfilter->dev->lock);
+        wake_up(&dmxdevfilter->buffer.queue);
 }

 static void dvb_dmxdev_filter_timer(struct dmxdev_filter *dmxdevfilter)
 {
 	struct dmx_sct_filter_params *para = &dmxdevfilter->params.sec;
-
+	
 	del_timer(&dmxdevfilter->timer);
 	if (para->timeout) {
-		dmxdevfilter->timer.expires =
-		    jiffies + 1 + (HZ / 2 + HZ * para->timeout) / 1000;
+                dmxdevfilter->timer.expires =
+			jiffies + 1 + (HZ / 2 + HZ * para->timeout) / 1000;
 		add_timer(&dmxdevfilter->timer);
 	}
 }
@@ -394,7 +404,7 @@ static void dvb_dmxdev_filter_timeout(unsigned long data)
 static void dvb_dmxdev_filter_timer(struct dmxdev_filter *dmxdevfilter)
 {
 	struct dmx_sct_filter_params *para = &dmxdevfilter->params.sec;
-
+	
 	del_timer(&dmxdevfilter->timer);
 	if (para->timeout) {
 		dmxdevfilter->timer.function = dvb_dmxdev_filter_timeout;
@@ -405,7 +415,6 @@ static void dvb_dmxdev_filter_timer(struct dmxdev_filter *dmxdevfilter)
 	}
 }
 #endif
-
 static int dvb_dmxdev_section_callback(const u8 *buffer1, size_t buffer1_len,
 				       const u8 *buffer2, size_t buffer2_len,
 				       struct dmx_section_filter *filter,
@@ -466,14 +475,11 @@ static int dvb_dmxdev_section_callback(const u8 *buffer1, size_t buffer1_len,

 static int dvb_dmxdev_ts_callback(const u8 *buffer1, size_t buffer1_len,
 				  const u8 *buffer2, size_t buffer2_len,
-				  struct dmx_ts_feed *feed,
-				  u32 *buffer_flags)
+				       struct dmx_ts_feed *feed,
+				       u32 *buffer_flags)
 {
 	struct dmxdev_filter *dmxdevfilter = feed->priv;
 	struct dvb_ringbuffer *buffer;
-#ifdef CONFIG_DVB_MMAP
-	struct dvb_vb2_ctx *ctx;
-#endif
 	int ret;

 	spin_lock(&dmxdevfilter->dev->lock);
@@ -840,11 +846,6 @@ static int dvb_demux_open(struct inode *inode, struct file *file)
 	if (mutex_lock_interruptible(&dmxdev->mutex))
 		return -ERESTARTSYS;

-	if (dmxdev->exit) {
-		mutex_unlock(&dmxdev->mutex);
-		return -ENODEV;
-	}
-
 	for (i = 0; i < dmxdev->filternum; i++)
 		if (dmxdev->filter[i].state == DMXDEV_STATE_FREE)
 			break;
@@ -1481,7 +1482,7 @@ static const struct dvb_device dvbdev_dvr = {

 int dvb_dmxdev_init(struct dmxdev *dmxdev, struct dvb_adapter *dvb_adapter)
 {
-	int i, ret;
+	int i;

 	if (dmxdev->demux->open(dmxdev->demux) < 0)
 		return -EUSERS;
@@ -1504,36 +1505,21 @@ int dvb_dmxdev_init(struct dmxdev *dmxdev, struct dvb_adapter *dvb_adapter)
 					    DMXDEV_STATE_FREE);
 	}

-	ret = dvb_register_device(dvb_adapter, &dmxdev->dvbdev, &dvbdev_demux, dmxdev,
+	dvb_register_device(dvb_adapter, &dmxdev->dvbdev, &dvbdev_demux, dmxdev,
 			    DVB_DEVICE_DEMUX, dmxdev->filternum);
-	if (ret < 0)
-		goto err_register_dvbdev;
-
-	ret = dvb_register_device(dvb_adapter, &dmxdev->dvr_dvbdev, &dvbdev_dvr,
+	dvb_register_device(dvb_adapter, &dmxdev->dvr_dvbdev, &dvbdev_dvr,
 			    dmxdev, DVB_DEVICE_DVR, dmxdev->filternum);
-	if (ret < 0)
-		goto err_register_dvr_dvbdev;

 	dvb_ringbuffer_init(&dmxdev->dvr_buffer, NULL, 8192);

 	return 0;
-
-err_register_dvr_dvbdev:
-	dvb_unregister_device(dmxdev->dvbdev);
-err_register_dvbdev:
-	vfree(dmxdev->filter);
-	dmxdev->filter = NULL;
-	return ret;
 }

 EXPORT_SYMBOL(dvb_dmxdev_init);

 void dvb_dmxdev_release(struct dmxdev *dmxdev)
 {
-	mutex_lock(&dmxdev->mutex);
 	dmxdev->exit = 1;
-	mutex_unlock(&dmxdev->mutex);
-
 	if (dmxdev->dvbdev->users > 1) {
 		wait_event(dmxdev->dvbdev->wait_queue,
 				dmxdev->dvbdev->users == 1);
--- a/dvb-core/dvb_ca_en50221.c
+++ b/dvb-core/dvb_ca_en50221.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
+ // SPDX-License-Identifier: GPL-2.0-or-later
 /*
 * dvb_ca.c: generic DVB functions for EN50221 CAM interfaces
 *
@@ -164,7 +164,7 @@ static void dvb_ca_private_free(struct dvb_ca_private *ca)
 {
 	unsigned int i;

-	dvb_device_put(ca->dvbdev);
+	dvb_free_device(ca->dvbdev);
 	for (i = 0; i < ca->slot_count; i++)
 		vfree(ca->slot_info[i].rx_buffer.data);

--- a/dvb-core/dvb_demux.c
+++ b/dvb-core/dvb_demux.c
@@ -1,10 +1,20 @@
-// SPDX-License-Identifier: LGPL-2.1-or-later
 /*
 * dvb_demux.c - DVB kernel demux API
 *
 * Copyright (C) 2000-2001 Ralph  Metzler <ralph@convergence.de>
 *		       & Marcus Metzler <marcus@convergence.de>
 *			 for convergence integrated media GmbH
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
 */

 #define pr_fmt(fmt) "dvb_demux: " fmt
@@ -246,7 +256,7 @@ static int dvb_dmx_swfilter_section_copy_dump(struct dvb_demux_feed *feed,
 {
 	struct dvb_demux *demux = feed->demux;
 	struct dmx_section_feed *sec = &feed->feed.sec;
-	u16 limit, seclen;
+	u16 limit, seclen, n;

 	if (sec->tsfeedp >= DMX_MAX_SECFEED_SIZE)
 		return 0;
@@ -275,7 +285,7 @@ static int dvb_dmx_swfilter_section_copy_dump(struct dvb_demux_feed *feed,
 	/* to be sure always set secbuf */
 	sec->secbuf = sec->secbuf_base + sec->secbufp;

-	while (sec->secbufp + 2 < limit) {
+	for (n = 0; sec->secbufp + 2 < limit; n++) {
 		seclen = section_length(sec->secbuf);
 		if (seclen <= 0 || seclen > DMX_MAX_SECTION_SIZE
 		    || seclen + sec->secbufp > limit)
@@ -479,8 +489,8 @@ static void dvb_dmx_swfilter_packet(struct dvb_demux *demux, const u8 *buf)
 					}

 					dprintk_tscheck("TS packet counter mismatch. PID=0x%x expected 0x%x got 0x%x\n",
-							pid, demux->cnt_storage[pid],
-							buf[3] & 0xf);
+						pid, demux->cnt_storage[pid],
+						buf[3] & 0xf);
 					demux->cnt_storage[pid] = buf[3] & 0xf;
 				}
 			}
--- a/dvb-core/dvb_frontend.c
+++ b/dvb-core/dvb_frontend.c
@@ -141,7 +141,7 @@ static void __dvb_frontend_free(struct dvb_frontend *fe)
 	struct dvb_frontend_private *fepriv = fe->frontend_priv;

 	if (fepriv)
-		dvb_device_put(fepriv->dvbdev);
+		dvb_free_device(fepriv->dvbdev);

 	dvb_frontend_invoke_release(fe, fe->ops.release);

@@ -489,8 +489,8 @@ static void dvb_frontend_swzigzag(struct dvb_frontend *fe)
 	struct dtv_frontend_properties *c = &fe->dtv_property_cache, tmp;

 	if (fepriv->max_drift)
-		dev_warn_once(fe->dvb->device,
-			      "Frontend requested software zigzag, but didn't set the frequency step size\n");
+		dev_warn(fe->dvb->device,
+			 "Frontend requested software zigzag, but didn't set the frequency step size\n");

 	/* if we've got no parameters, just keep idling */
 	if (fepriv->state & FESTATE_IDLE) {
@@ -924,7 +924,6 @@ static void dvb_frontend_get_frequency_limits(struct dvb_frontend *fe,

 	/* If the standard is for satellite, convert frequencies to kHz */
 	switch (c->delivery_system) {
-	case SYS_DSS:
 	case SYS_DVBS:
 	case SYS_DVBS2:
 	case SYS_TURBO:
@@ -950,7 +949,6 @@ static u32 dvb_frontend_get_stepsize(struct dvb_frontend *fe)
 	u32 step = max(fe_step, tuner_step);

 	switch (c->delivery_system) {
-	case SYS_DSS:
 	case SYS_DVBS:
 	case SYS_DVBS2:
 	case SYS_TURBO:
@@ -982,7 +980,6 @@ static int dvb_frontend_check_parameters(struct dvb_frontend *fe)

 	/* range check: symbol rate */
 	switch (c->delivery_system) {
-	case SYS_DSS:
 	case SYS_DVBS:
 	case SYS_DVBS2:
 	case SYS_TURBO:
@@ -1050,10 +1047,6 @@ static int dvb_frontend_clear_cache(struct dvb_frontend *fe)
 	c->input = NO_INPUT;

 	switch (c->delivery_system) {
-	case SYS_DSS:
-		c->modulation = QPSK;
-		c->rolloff = ROLLOFF_20;
-		break;
 	case SYS_DVBS:
 	case SYS_DVBS2:
 	case SYS_TURBO:
@@ -1846,7 +1839,6 @@ static void prepare_tuning_algo_parameters(struct dvb_frontend *fe)
 	} else {
 		/* default values */
 		switch (c->delivery_system) {
-		case SYS_DSS:
 		case SYS_DVBS:
 		case SYS_DVBS2:
 		case SYS_ISDBS:
@@ -2320,9 +2312,6 @@ static int dtv_set_frontend(struct dvb_frontend *fe)
 	case SYS_DVBC_ANNEX_C:
 		rolloff = 113;
 		break;
-	case SYS_DSS:
-		rolloff = 120;
-		break;
 	case SYS_DVBS:
 	case SYS_TURBO:
 	case SYS_ISDBS:
@@ -2593,7 +2582,8 @@ static int dvb_frontend_handle_ioctl(struct file *file,

 	case FE_DISEQC_SEND_BURST:
 		if (fe->ops.diseqc_send_burst) {
-			err = fe->ops.diseqc_send_burst(fe, (long)parg);
+			err = fe->ops.diseqc_send_burst(fe,
+						(enum fe_sec_mini_cmd)parg);
 			fepriv->state = FESTATE_DISEQC;
 			fepriv->status = 0;
 		}
@@ -2601,8 +2591,9 @@ static int dvb_frontend_handle_ioctl(struct file *file,

 	case FE_SET_TONE:
 		if (fe->ops.set_tone) {
-			fepriv->tone = (long)parg;
-			err = fe->ops.set_tone(fe, fepriv->tone);
+			err = fe->ops.set_tone(fe,
+					       (enum fe_sec_tone_mode)parg);
+			fepriv->tone = (enum fe_sec_tone_mode)parg;
 			fepriv->state = FESTATE_DISEQC;
 			fepriv->status = 0;
 		}
@@ -2610,8 +2601,9 @@ static int dvb_frontend_handle_ioctl(struct file *file,

 	case FE_SET_VOLTAGE:
 		if (fe->ops.set_voltage) {
-			fepriv->voltage = (long)parg;
-			err = fe->ops.set_voltage(fe, fepriv->voltage);
+			err = fe->ops.set_voltage(fe,
+						  (enum fe_sec_voltage)parg);
+			fepriv->voltage = (enum fe_sec_voltage)parg;
 			fepriv->state = FESTATE_DISEQC;
 			fepriv->status = 0;
 		}
@@ -2775,6 +2767,7 @@ typedef unsigned int __poll_t;
 #define EPOLLOUT POLLOUT
 #endif

+
 static __poll_t dvb_frontend_poll(struct file *file, struct poll_table_struct *wait)
 {
 	struct dvb_device *dvbdev = file->private_data;
@@ -2803,17 +2796,7 @@ static int dvb_frontend_open(struct inode *inode, struct file *file)
 	if (fe->exit == DVB_FE_DEVICE_REMOVED)
 		return -ENODEV;

-	if (adapter->mfe_shared == 2) {
-		mutex_lock(&adapter->mfe_lock);
-		if ((file->f_flags & O_ACCMODE) != O_RDONLY) {
-			if (adapter->mfe_dvbdev &&
-			    !adapter->mfe_dvbdev->writers) {
-				mutex_unlock(&adapter->mfe_lock);
-				return -EBUSY;
-			}
-			adapter->mfe_dvbdev = dvbdev;
-		}
-	} else if (adapter->mfe_shared) {
+	if (adapter->mfe_shared) {
 		mutex_lock(&adapter->mfe_lock);

 		if (!adapter->mfe_dvbdev)
@@ -2991,9 +2974,7 @@ int dvb_frontend_suspend(struct dvb_frontend *fe)
 	else if (fe->ops.tuner_ops.sleep)
 		ret = fe->ops.tuner_ops.sleep(fe);

-	if (fe->ops.suspend)
-		ret = fe->ops.suspend(fe);
-	else if (fe->ops.sleep)
+	if (fe->ops.sleep)
 		ret = fe->ops.sleep(fe);

 	return ret;
@@ -3009,9 +2990,7 @@ int dvb_frontend_resume(struct dvb_frontend *fe)
 		fe->id);

 	fe->exit = DVB_FE_DEVICE_RESUME;
-	if (fe->ops.resume)
-		ret = fe->ops.resume(fe);
-	else if (fe->ops.init)
+	if (fe->ops.init)
 		ret = fe->ops.init(fe);

 	if (fe->ops.tuner_ops.resume)
@@ -3045,7 +3024,6 @@ int dvb_register_frontend(struct dvb_adapter *dvb,
 		.name = fe->ops.info.name,
 #endif
 	};
-	int ret;

 	dev_dbg(dvb->device, "%s:\n", __func__);

@@ -3075,14 +3053,8 @@ int dvb_register_frontend(struct dvb_adapter *dvb,
 	fe->dvb = dvb;
 	fepriv->inversion = INVERSION_OFF;

-	ret = dvb_register_device(fe->dvb, &fepriv->dvbdev, &dvbdev_template,
-				  fe, DVB_DEVICE_FRONTEND, 0);
-
-	if (ret) {
-		dvb_frontend_put(fe);
-		mutex_unlock(&frontend_mutex);
-		return ret;
-	}
+	dvb_register_device(fe->dvb, &fepriv->dvbdev, &dvbdev_template,
+			    fe, DVB_DEVICE_FRONTEND, 0);

 	dev_info(fe->dvb->device,
 		 "DVB: registering adapter %i frontend %i (%s)...\n",
--- a/dvb-core/dvb_net.c
+++ b/dvb-core/dvb_net.c
@@ -60,9 +60,6 @@

 #include <media/dvb_demux.h>
 #include <media/dvb_net.h>
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 18))
-#include <linux/nospec.h>
-#endif

 static inline __u32 iov_crc32( __u32 c, struct kvec *iov, unsigned int cnt )
 {
@@ -664,8 +661,8 @@ static void dvb_net_ule_check_crc(struct dvb_net_ule_handle *h,
 			h->ts_remain,
 			h->ts_remain > 2 ?
 				*(unsigned short *)h->from_where : 0);
-		
-#ifdef DVB_ULE_DEBUG
+
+        #ifdef DVB_ULE_DEBUG
 		hexdump(iov[0].iov_base, iov[0].iov_len);
 		hexdump(iov[1].iov_base, iov[1].iov_len);
 		hexdump(iov[2].iov_base, iov[2].iov_len);
@@ -681,8 +678,8 @@ static void dvb_net_ule_check_crc(struct dvb_net_ule_handle *h,
 			hexdump(ule_where - TS_SZ, TS_SZ);
 		}
 		ule_dump = 1;
-#endif
-		
+	#endif
+
 		h->dev->stats.rx_errors++;
 		h->dev->stats.rx_crc_errors++;
 		dev_kfree_skb(h->priv->ule_skb);
@@ -1065,7 +1062,7 @@ static int dvb_net_feed_start(struct net_device *dev)
 	int ret = 0, i;
 	struct dvb_net_priv *priv = netdev_priv(dev);
 	struct dmx_demux *demux = priv->demux;
-	const unsigned char *mac = (const unsigned char *) dev->dev_addr;
+	const unsigned char *mac = (unsigned char *) dev->dev_addr;

 	netdev_dbg(dev, "rx_mode %i\n", priv->rx_mode);
 	mutex_lock(&priv->mutex);
@@ -1285,11 +1282,8 @@ static int dvb_net_set_mac (struct net_device *dev, void *p)
 	struct dvb_net_priv *priv = netdev_priv(dev);
 	struct sockaddr *addr=p;

-#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0))
 	memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
-#else
-	eth_hw_addr_set(dev, addr->sa_data);
-#endif
+
 	if (netif_running(dev))
 		schedule_work(&priv->restart_net_feed_wq);

@@ -1387,11 +1381,8 @@ static int dvb_net_add_if(struct dvb_net *dvbnet, u16 pid, u8 feedtype)
 			 dvbnet->dvbdev->adapter->num, if_num);

 	net->addr_len = 6;
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0))
 	memcpy(net->dev_addr, dvbnet->dvbdev->adapter->proposed_mac, 6);
-#else
-	eth_hw_addr_set(net, dvbnet->dvbdev->adapter->proposed_mac);
-#endif
+
 	dvbnet->device[if_num] = net;

 	priv = netdev_priv(net);
@@ -1486,21 +1477,14 @@ static int dvb_net_do_ioctl(struct file *file,
 		struct net_device *netdev;
 		struct dvb_net_priv *priv_data;
 		struct dvb_net_if *dvbnetif = parg;
-		int if_num = dvbnetif->if_num;

-		if (if_num >= DVB_NET_DEVICES_MAX) {
-			ret = -EINVAL;
-			goto ioctl_error;
-		}
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 18))
-		if_num = array_index_nospec(if_num, DVB_NET_DEVICES_MAX);
-#endif
-		if (!dvbnet->state[if_num]) {
+		if (dvbnetif->if_num >= DVB_NET_DEVICES_MAX ||
+		    !dvbnet->state[dvbnetif->if_num]) {
 			ret = -EINVAL;
 			goto ioctl_error;
 		}

-		netdev = dvbnet->device[if_num];
+		netdev = dvbnet->device[dvbnetif->if_num];

 		priv_data = netdev_priv(netdev);
 		dvbnetif->pid=priv_data->pid;
@@ -1553,21 +1537,14 @@ static int dvb_net_do_ioctl(struct file *file,
 		struct net_device *netdev;
 		struct dvb_net_priv *priv_data;
 		struct __dvb_net_if_old *dvbnetif = parg;
-		int if_num = dvbnetif->if_num;

-		if (if_num >= DVB_NET_DEVICES_MAX) {
-			ret = -EINVAL;
-			goto ioctl_error;
-		}
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 18))
-		if_num = array_index_nospec(if_num, DVB_NET_DEVICES_MAX);
-#endif
-		if (!dvbnet->state[if_num]) {
+		if (dvbnetif->if_num >= DVB_NET_DEVICES_MAX ||
+		    !dvbnet->state[dvbnetif->if_num]) {
 			ret = -EINVAL;
 			goto ioctl_error;
 		}

-		netdev = dvbnet->device[if_num];
+		netdev = dvbnet->device[dvbnetif->if_num];

 		priv_data = netdev_priv(netdev);
 		dvbnetif->pid=priv_data->pid;
--- a/dvb-core/dvb_ringbuffer.c
+++ b/dvb-core/dvb_ringbuffer.c
@@ -63,7 +63,7 @@ int dvb_ringbuffer_empty(struct dvb_ringbuffer *rbuf)
 	 * this pairs with smp_store_release() in dvb_ringbuffer_write(),
 	 * dvb_ringbuffer_write_user(), or dvb_ringbuffer_reset()
 	 *
-	 * for memory barriers also see Documentation/core-api/circular-buffers.rst
+	 * for memory barriers also see Documentation/core-api/circular-buffers.txt
 	 */
 	return (rbuf->pread == smp_load_acquire(&rbuf->pwrite));
 #endif
@@ -75,7 +75,7 @@ ssize_t dvb_ringbuffer_free(struct dvb_ringbuffer *rbuf)
 {
 	ssize_t free;

-	/* READ_ONCE() to load read pointer on writer side
+	/* ACCESS_ONCE() to load read pointer on writer side
 	 * this pairs with smp_store_release() in dvb_ringbuffer_read(),
 	 * dvb_ringbuffer_read_user(), dvb_ringbuffer_flush(),
 	 * or dvb_ringbuffer_reset()
@@ -171,7 +171,7 @@ ssize_t dvb_ringbuffer_read_user(struct dvb_ringbuffer *rbuf, u8 __user *buf, si
 #else
 		/* smp_store_release() for read pointer update to ensure
 		 * that buf is not overwritten until read is complete,
-		 * this pairs with READ_ONCE() in dvb_ringbuffer_free()
+		 * this pairs with ACCESS_ONCE() in dvb_ringbuffer_free()
 		 */
 		smp_store_release(&rbuf->pread, 0);
 #endif
@@ -203,7 +203,7 @@ void dvb_ringbuffer_read(struct dvb_ringbuffer *rbuf, u8 *buf, size_t len)
 #else
 		/* smp_store_release() for read pointer update to ensure
 		 * that buf is not overwritten until read is complete,
-		 * this pairs with READ_ONCE() in dvb_ringbuffer_free()
+		 * this pairs with ACCESS_ONCE() in dvb_ringbuffer_free()
 		 */
 		smp_store_release(&rbuf->pread, 0);
 #endif
@@ -391,9 +391,7 @@ ssize_t dvb_ringbuffer_pkt_next(struct dvb_ringbuffer *rbuf, size_t idx, size_t*
 		idx = (idx + curpktlen + DVB_RINGBUFFER_PKTHDRSIZE) % rbuf->size;
 	}

-	consumed = (idx - rbuf->pread);
-	if (consumed < 0)
-		consumed += rbuf->size;
+	consumed = (idx - rbuf->pread) % rbuf->size;

 	while((dvb_ringbuffer_avail(rbuf) - consumed) > DVB_RINGBUFFER_PKTHDRSIZE) {

--- a/dvb-core/dvb_vb2.c
+++ b/dvb-core/dvb_vb2.c
@@ -5,6 +5,10 @@
 * Copyright (C) 2015 Samsung Electronics
 *
 * Author: jh1009.sung@samsung.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation.
 */

 #include <linux/err.h>
@@ -354,12 +358,6 @@ int dvb_vb2_reqbufs(struct dvb_vb2_ctx *ctx, struct dmx_requestbuffers *req)

 int dvb_vb2_querybuf(struct dvb_vb2_ctx *ctx, struct dmx_buffer *b)
 {
-	struct vb2_queue *q = &ctx->vb_q;
-
-	if (b->index >= q->num_buffers) {
-		dprintk(1, "[%s] buffer index out of range\n", ctx->name);
-		return -EINVAL;
-	}
 	vb2_core_querybuf(&ctx->vb_q, b->index, b);
 	dprintk(3, "[%s] index=%d\n", ctx->name, b->index);
 	return 0;
@@ -384,13 +382,8 @@ int dvb_vb2_expbuf(struct dvb_vb2_ctx *ctx, struct dmx_exportbuffer *exp)

 int dvb_vb2_qbuf(struct dvb_vb2_ctx *ctx, struct dmx_buffer *b)
 {
-	struct vb2_queue *q = &ctx->vb_q;
 	int ret;

-	if (b->index >= q->num_buffers) {
-		dprintk(1, "[%s] buffer index out of range\n", ctx->name);
-		return -EINVAL;
-	}
 	ret = vb2_core_qbuf(&ctx->vb_q, b->index, b, NULL);
 	if (ret) {
 		dprintk(1, "[%s] index=%d errno=%d\n", ctx->name,
--- a/dvb-core/dvbdev.c
+++ b/dvb-core/dvbdev.c
@@ -1,10 +1,20 @@
-// SPDX-License-Identifier: LGPL-2.1-or-later
 /*
 * dvbdev.c
 *
 * Copyright (C) 2000 Ralph  Metzler <ralph@convergence.de>
 *                  & Marcus Metzler <marcus@convergence.de>
 *                    for convergence integrated media GmbH
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
 */

 #define pr_fmt(fmt) "dvbdev: " fmt
@@ -108,7 +118,7 @@ static int dvb_device_open(struct inode *inode, struct file *file)
 		new_fops = fops_get(dvbdev->fops);
 		if (!new_fops)
 			goto fail;
-		file->private_data = dvb_device_get(dvbdev);
+		file->private_data = dvbdev;
 		replace_fops(file, new_fops);
 		if (file->f_op->open)
 			err = file->f_op->open(inode, file);
@@ -172,9 +182,6 @@ int dvb_generic_release(struct inode *inode, struct file *file)
 	}

 	dvbdev->users++;
-
-	dvb_device_put(dvbdev);
-
 	return 0;
 }
 EXPORT_SYMBOL(dvb_generic_release);
@@ -257,7 +264,7 @@ static void dvb_media_device_free(struct dvb_device *dvbdev)
 static int dvb_create_tsout_entity(struct dvb_device *dvbdev,
 				    const char *name, int npads)
 {
-	int i;
+	int i, ret = 0;

 	dvbdev->tsout_pads = kcalloc(npads, sizeof(*dvbdev->tsout_pads),
 				     GFP_KERNEL);
@@ -274,7 +281,6 @@ static int dvb_create_tsout_entity(struct dvb_device *dvbdev,
 	for (i = 0; i < npads; i++) {
 		struct media_pad *pads = &dvbdev->tsout_pads[i];
 		struct media_entity *entity = &dvbdev->tsout_entity[i];
-		int ret;

 		entity->name = kasprintf(GFP_KERNEL, "%s #%d", name, i);
 		if (!entity->name)
@@ -347,7 +353,6 @@ static int dvb_create_media_entity(struct dvb_device *dvbdev,
 				       GFP_KERNEL);
 		if (!dvbdev->pads) {
 			kfree(dvbdev->entity);
-			dvbdev->entity = NULL;
 			return -ENOMEM;
 		}
 	}
@@ -494,7 +499,6 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
 	}

 	memcpy(dvbdev, template, sizeof(struct dvb_device));
-	kref_init(&dvbdev->ref);
 	dvbdev->type = type;
 	dvbdev->id = id;
 	dvbdev->adapter = adap;
@@ -525,7 +529,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
 #endif

 	dvbdev->minor = minor;
-	dvb_minors[minor] = dvb_device_get(dvbdev);
+	dvb_minors[minor] = dvbdev;
 	up_write(&minor_rwsem);

 	ret = dvb_register_media_device(dvbdev, type, minor, demux_sink_pads);
@@ -570,7 +574,6 @@ void dvb_remove_device(struct dvb_device *dvbdev)

 	down_write(&minor_rwsem);
 	dvb_minors[dvbdev->minor] = NULL;
-	dvb_device_put(dvbdev);
 	up_write(&minor_rwsem);

 	dvb_media_device_free(dvbdev);
@@ -582,34 +585,21 @@ void dvb_remove_device(struct dvb_device *dvbdev)
 EXPORT_SYMBOL(dvb_remove_device);


-static void dvb_free_device(struct kref *ref)
+void dvb_free_device(struct dvb_device *dvbdev)
 {
-	struct dvb_device *dvbdev = container_of(ref, struct dvb_device, ref);
+	if (!dvbdev)
+		return;

 	kfree (dvbdev->fops);
 	kfree (dvbdev);
 }
-
-
-struct dvb_device *dvb_device_get(struct dvb_device *dvbdev)
-{
-	kref_get(&dvbdev->ref);
-	return dvbdev;
-}
-EXPORT_SYMBOL(dvb_device_get);
-
-
-void dvb_device_put(struct dvb_device *dvbdev)
-{
-	if (dvbdev)
-		kref_put(&dvbdev->ref, dvb_free_device);
-}
+EXPORT_SYMBOL(dvb_free_device);


 void dvb_unregister_device(struct dvb_device *dvbdev)
 {
 	dvb_remove_device(dvbdev);
-	dvb_device_put(dvbdev);
+	dvb_free_device(dvbdev);
 }
 EXPORT_SYMBOL(dvb_unregister_device);

@@ -1051,13 +1041,9 @@ EXPORT_SYMBOL_GPL(dvb_module_release);
 #endif
 #endif

-#if (KERNEL_VERSION(6, 2, 0) > LINUX_VERSION_CODE)
 static int dvb_uevent(struct device *dev, struct kobj_uevent_env *env)
-#else
-static int dvb_uevent(const struct device *dev, struct kobj_uevent_env *env)
-#endif
 {
-	const struct dvb_device *dvbdev = dev_get_drvdata(dev);
+	struct dvb_device *dvbdev = dev_get_drvdata(dev);

 	add_uevent_var(env, "DVB_ADAPTER_NUM=%d", dvbdev->adapter->num);
 	add_uevent_var(env, "DVB_DEVICE_TYPE=%s", dnames[dvbdev->type]);
@@ -1065,13 +1051,9 @@ static int dvb_uevent(const struct device *dev, struct kobj_uevent_env *env)
 	return 0;
 }

-#if (KERNEL_VERSION(6, 2, 0) > LINUX_VERSION_CODE)
 static char *dvb_devnode(struct device *dev, umode_t *mode)
-#else
-static char *dvb_devnode(const struct device *dev, umode_t *mode)
-#endif
 {
-	const struct dvb_device *dvbdev = dev_get_drvdata(dev);
+	struct dvb_device *dvbdev = dev_get_drvdata(dev);

 	return kasprintf(GFP_KERNEL, "dvb/adapter%d/%s%d",
 		dvbdev->adapter->num, dnames[dvbdev->type], dvbdev->id);
@@ -1094,11 +1076,7 @@ static int __init init_dvbdev(void)
 		goto error;
 	}

-#if (LINUX_VERSION_CODE < KERNEL_VERSION(6,4,0))
 	dvb_class = class_create(THIS_MODULE, "dvb");
-#else
-	dvb_class = class_create("dvb");
-#endif
 	if (IS_ERR(dvb_class)) {
 		retval = PTR_ERR(dvb_class);
 		goto error;
--- a/include/dd_compat.h
+++ b/include/dd_compat.h
@@ -1,11 +1,3 @@
-#include <linux/version.h>
-
-#if (KERNEL_VERSION(3, 8, 0) <= LINUX_VERSION_CODE)
-#define __devexit
-#define __devinit
-#define __devinitconst
-#endif
-
 #ifndef __has_attribute
 #define __has_attribute(x) 0
 #endif
--- a/include/linux/dvb/audio.h
+++ b/include/linux/dvb/audio.h
@@ -7,6 +7,21 @@
 * Copyright (C) 2000 Ralph  Metzler <ralph@convergence.de>
 *                  & Marcus Metzler <marcus@convergence.de>
 *                    for convergence integrated media GmbH
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Lesser Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
 */

 #ifndef _DVBAUDIO_H_
@@ -39,7 +54,7 @@ typedef enum {
 typedef struct audio_mixer {
 	unsigned int volume_left;
 	unsigned int volume_right;
-  /* what else do we need? bass, pass-through, ... */
+/* what else do we need? bass, pass-through, ... */
 } audio_mixer_t;


--- a/include/linux/dvb/ca.h
+++ b/include/linux/dvb/ca.h
@@ -5,6 +5,21 @@
 * Copyright (C) 2000 Ralph  Metzler <ralph@convergence.de>
 *                  & Marcus Metzler <marcus@convergence.de>
 *                    for convergence integrated media GmbH
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Lesser Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
 */

 #ifndef _DVBCA_H_
@@ -117,6 +132,11 @@ struct ca_descr {
 	unsigned char cw[8];
 };

+struct ca_pid {
+	unsigned int pid;
+	int index;/* -1 == disable*/
+};
+
 #define CA_RESET          _IO('o', 128)
 #define CA_GET_CAP        _IOR('o', 129, struct ca_caps)
 #define CA_GET_SLOT_INFO  _IOR('o', 130, struct ca_slot_info)
@@ -124,6 +144,7 @@ struct ca_descr {
 #define CA_GET_MSG        _IOR('o', 132, struct ca_msg)
 #define CA_SEND_MSG       _IOW('o', 133, struct ca_msg)
 #define CA_SET_DESCR      _IOW('o', 134, struct ca_descr)
+#define CA_SET_PID        _IOW('o', 135, struct ca_pid)

 #if !defined(__KERNEL__)

@@ -133,6 +154,7 @@ typedef struct ca_descr_info  ca_descr_info_t;
 typedef struct ca_caps  ca_caps_t;
 typedef struct ca_msg ca_msg_t;
 typedef struct ca_descr ca_descr_t;
+typedef struct ca_pid ca_pid_t;

 #endif

--- a/include/linux/dvb/dmx.h
+++ b/include/linux/dvb/dmx.h
@@ -5,6 +5,21 @@
 * Copyright (C) 2000 Marcus Metzler <marcus@convergence.de>
 *                  & Ralph  Metzler <ralph@convergence.de>
 *                    for convergence integrated media GmbH
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
 */

 #ifndef _UAPI_DVBDMX_H_
--- a/include/linux/dvb/frontend.h
+++ b/include/linux/dvb/frontend.h
@@ -7,6 +7,21 @@
 *		    Holger Waechtler <holger@convergence.de>
 *		    Andre Draszik <ad@convergence.de>
 *		    for convergence integrated media GmbH
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
 */

 #ifndef _DVBFRONTEND_H_
@@ -267,6 +282,7 @@ enum fe_spectral_inversion {
 /**
 * enum fe_code_rate - Type of Forward Error Correction (FEC)
 *
+ *
 * @FEC_NONE: No Forward Error Correction Code
 * @FEC_1_2:  Forward Error Correction Code 1/2
 * @FEC_2_3:  Forward Error Correction Code 2/3
@@ -280,28 +296,7 @@ enum fe_spectral_inversion {
 * @FEC_3_5:  Forward Error Correction Code 3/5
 * @FEC_9_10: Forward Error Correction Code 9/10
 * @FEC_2_5:  Forward Error Correction Code 2/5
- * @FEC_1_3:  Forward Error Correction Code 1/3
- * @FEC_1_4:  Forward Error Correction Code 1/4
- * @FEC_5_9:  Forward Error Correction Code 5/9
- * @FEC_7_9:  Forward Error Correction Code 7/9
- * @FEC_8_15:  Forward Error Correction Code 8/15
- * @FEC_11_15: Forward Error Correction Code 11/15
- * @FEC_13_18: Forward Error Correction Code 13/18
- * @FEC_9_20:  Forward Error Correction Code 9/20
- * @FEC_11_20: Forward Error Correction Code 11/20
- * @FEC_23_36: Forward Error Correction Code 23/36
- * @FEC_25_36: Forward Error Correction Code 25/36
- * @FEC_13_45: Forward Error Correction Code 13/45
- * @FEC_26_45: Forward Error Correction Code 26/45
- * @FEC_28_45: Forward Error Correction Code 28/45
- * @FEC_32_45: Forward Error Correction Code 32/45
- * @FEC_77_90: Forward Error Correction Code 77/90
- * @FEC_11_45: Forward Error Correction Code 11/45
- * @FEC_4_15: Forward Error Correction Code 4/15
- * @FEC_14_45: Forward Error Correction Code 14/45
- * @FEC_7_15: Forward Error Correction Code 7/15
- * @FEC_29_45: Forward Error Correction Code 29/45
- * @FEC_31_45: Forward Error Correction Code 31/45
+ *
 * Please note that not all FEC types are supported by a given standard.
 */
 enum fe_code_rate {
@@ -318,28 +313,8 @@ enum fe_code_rate {
 	FEC_3_5,
 	FEC_9_10,
 	FEC_2_5,
-	FEC_1_3,
 	FEC_1_4,
-	FEC_5_9,
-	FEC_7_9,
-	FEC_8_15,
-	FEC_11_15,
-	FEC_13_18,
-	FEC_9_20,
-	FEC_11_20,
-	FEC_23_36,
-	FEC_25_36,
-	FEC_13_45,
-	FEC_26_45,
-	FEC_28_45,
-	FEC_32_45,
-	FEC_77_90,
-	FEC_11_45,
-	FEC_4_15,
-	FEC_14_45,
-	FEC_7_15,
-	FEC_29_45,
-	FEC_31_45,
+	FEC_1_3,
 };

 /**
@@ -358,16 +333,6 @@ enum fe_code_rate {
 * @APSK_32:	32-APSK modulation
 * @DQPSK:	DQPSK modulation
 * @QAM_4_NR:	4-QAM-NR modulation
- * @QAM_1024:	1024-QAM modulation
- * @QAM_4096:	4096-QAM modulation
- * @APSK_8_L:	8APSK-L modulation
- * @APSK_16_L:	16APSK-L modulation
- * @APSK_32_L:	32APSK-L modulation
- * @APSK_64:	64APSK modulation
- * @APSK_64_L:	64APSK-L modulation
- * @APSK_128:	128APSK modulation
- * @APSK_256:	256APSK modulation
- * @APSK_256_L:	256APSK-L modulation
 *
 * Please note that not all modulations are supported by a given standard.
 *
@@ -387,16 +352,9 @@ enum fe_modulation {
 	APSK_32,
 	DQPSK,
 	QAM_4_NR,
-	QAM_1024,
-	QAM_4096,
-	APSK_8_L,
-	APSK_16_L,
-	APSK_32_L,
 	APSK_64,
-	APSK_64_L,
 	APSK_128,
 	APSK_256,
-	APSK_256_L,
 };

 /**
@@ -451,7 +409,6 @@ enum fe_transmit_mode {
 * @GUARD_INTERVAL_PN420:	PN length 420 (1/4)
 * @GUARD_INTERVAL_PN595:	PN length 595 (1/6)
 * @GUARD_INTERVAL_PN945:	PN length 945 (1/9)
- * @GUARD_INTERVAL_1_64:	Guard interval 1/64
 *
 * Please note that not all guard intervals are supported by a given standard.
 */
@@ -467,7 +424,6 @@ enum fe_guard_interval {
 	GUARD_INTERVAL_PN420,
 	GUARD_INTERVAL_PN595,
 	GUARD_INTERVAL_PN945,
-	GUARD_INTERVAL_1_64,
 };

 /**
@@ -621,9 +577,6 @@ enum fe_pilot {
 * @ROLLOFF_20:		Roloff factor: α=20%
 * @ROLLOFF_25:		Roloff factor: α=25%
 * @ROLLOFF_AUTO:	Auto-detect the roloff factor.
- * @ROLLOFF_15:		Rolloff factor: α=15%
- * @ROLLOFF_10:		Rolloff factor: α=10%
- * @ROLLOFF_5:		Rolloff factor: α=5%
 *
 * .. note:
 *
@@ -650,8 +603,6 @@ enum fe_rolloff {
 *	Cable TV: DVB-C following ITU-T J.83 Annex B spec (ClearQAM)
 * @SYS_DVBC_ANNEX_C:
 *	Cable TV: DVB-C following ITU-T J.83 Annex C spec
- * @SYS_DVBC2:
- *      Cable TV: DVB-C2
 * @SYS_ISDBC:
 *	Cable TV: ISDB-C (no drivers yet)
 * @SYS_DVBT:
@@ -669,7 +620,7 @@ enum fe_rolloff {
 * @SYS_DVBS:
 *	Satellite TV: DVB-S
 * @SYS_DVBS2:
- *	Satellite TV: DVB-S2 and DVB-S2X
+ *	Satellite TV: DVB-S2
 * @SYS_TURBO:
 *	Satellite TV: DVB-S Turbo
 * @SYS_ISDBS:
@@ -779,7 +730,7 @@ enum atscmh_rs_frame_mode {
 };

 /**
- * enum atscmh_rs_code_mode - ATSC-M/H Reed Solomon modes
+ * enum atscmh_rs_code_mode
 * @ATSCMH_RSCODE_211_187:	Reed Solomon code (211,187).
 * @ATSCMH_RSCODE_223_187:	Reed Solomon code (223,187).
 * @ATSCMH_RSCODE_235_187:	Reed Solomon code (235,187).
@@ -820,8 +771,8 @@ enum fecap_scale_params {
 * struct dtv_stats - Used for reading a DTV status property
 *
 * @scale:
- *	Filled with enum fecap_scale_params - the scale in usage
- *	for that parameter
+ *    Filled with enum fecap_scale_params - the scale in usage
+ *    for that parameter
 *
 * @svalue:
 *	integer value of the measure, for %FE_SCALE_DECIBEL,
@@ -890,18 +841,18 @@ struct dtv_fe_stats {
 /**
 * struct dtv_property - store one of frontend command and its value
 *
- * @cmd:		Digital TV command.
- * @reserved:		Not used.
- * @u:			Union with the values for the command.
- * @u.data:		A unsigned 32 bits integer with command value.
- * @u.buffer:		Struct to store bigger properties.
- *			Currently unused.
- * @u.buffer.data:	an unsigned 32-bits array.
- * @u.buffer.len:	number of elements of the buffer.
- * @u.buffer.reserved1:	Reserved.
- * @u.buffer.reserved2:	Reserved.
- * @u.st:		a &struct dtv_fe_stats array of statistics.
- * @result:		Currently unused.
+ * @cmd:	Digital TV command.
+ * @reserved:	Not used.
+ * @u:		Union with the values for the command.
+ * @u.data:           A unsigned 32 bits integer with command value.
+ * @u.buffer:         Struct to store bigger properties.
+ *                    Currently unused.
+ * @u.buffer.data:    an unsigned 32-bits array.
+ * @u.buffer.len:     number of elements of the buffer.
+ * @u.buffer.reserved1:       Reserved.
+ * @u.buffer.reserved2:       Reserved.
+ * @u.st:             a &struct dtv_fe_stats array of statistics.
+ * @result:           Currently unused.
 *
 */
 struct dtv_property {
--- a/include/linux/dvb/net.h
+++ b/include/linux/dvb/net.h
@@ -5,6 +5,21 @@
 * Copyright (C) 2000 Marcus Metzler <marcus@convergence.de>
 *                  & Ralph  Metzler <ralph@convergence.de>
 *                    for convergence integrated media GmbH
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
 */

 #ifndef _DVBNET_H_
--- a/include/linux/dvb/osd.h
+++ b/include/linux/dvb/osd.h
@@ -7,6 +7,21 @@
 * Copyright (C) 2001 Ralph  Metzler <ralph@convergence.de>
 *                  & Marcus Metzler <marcus@convergence.de>
 *                    for convergence integrated media GmbH
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Lesser Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
 */

 #ifndef _DVBOSD_H_
--- a/include/linux/dvb/version.h
+++ b/include/linux/dvb/version.h
@@ -4,6 +4,21 @@
 *
 * Copyright (C) 2000 Holger Waechtler <holger@convergence.de>
 *                    for convergence integrated media GmbH
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
 */

 #ifndef _DVBVERSION_H_
--- a/include/linux/dvb/video.h
+++ b/include/linux/dvb/video.h
@@ -7,6 +7,21 @@
 * Copyright (C) 2000 Marcus Metzler <marcus@convergence.de>
 *                  & Ralph  Metzler <ralph@convergence.de>
 *                    for convergence integrated media GmbH
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
 */

 #ifndef _UAPI_DVBVIDEO_H_
--- a/include/linux/media/dvb_frontend.h
+++ b/include/linux/media/dvb_frontend.h
@@ -369,10 +369,6 @@ struct dvb_frontend_internal_info {
 *			allocated by the driver.
 * @init:		callback function used to initialize the tuner device.
 * @sleep:		callback function used to put the tuner to sleep.
- * @suspend:		callback function used to inform that the Kernel will
- *			suspend.
- * @resume:		callback function used to inform that the Kernel is
- *			resuming from suspend.
 * @write:		callback function used by some demod legacy drivers to
 *			allow other drivers to write data into their registers.
 *			Should not be used on new drivers.
@@ -442,6 +438,7 @@ struct dvb_frontend_internal_info {
 * @analog_ops:		pointer to &struct analog_demod_ops
 */
 struct dvb_frontend_ops {
+
 	struct dvb_frontend_internal_info info;

 	u8 delsys[MAX_DELSYS];
@@ -452,8 +449,6 @@ struct dvb_frontend_ops {

 	int (*init)(struct dvb_frontend* fe);
 	int (*sleep)(struct dvb_frontend* fe);
-	int (*suspend)(struct dvb_frontend *fe);
-	int (*resume)(struct dvb_frontend *fe);

 	int (*write)(struct dvb_frontend* fe, const u8 buf[], int len);

@@ -770,8 +765,7 @@ void dvb_frontend_detach(struct dvb_frontend *fe);
 * &dvb_frontend_ops.tuner_ops.suspend\(\) is available, it calls it. Otherwise,
 * it will call &dvb_frontend_ops.tuner_ops.sleep\(\), if available.
 *
- * It will also call &dvb_frontend_ops.suspend\(\) to put the demod to suspend,
- * if available. Otherwise it will call &dvb_frontend_ops.sleep\(\).
+ * It will also call &dvb_frontend_ops.sleep\(\) to put the demod to suspend.
 *
 * The drivers should also call dvb_frontend_suspend\(\) as part of their
 * handler for the &device_driver.suspend\(\).
@@ -785,9 +779,7 @@ int dvb_frontend_suspend(struct dvb_frontend *fe);
 *
 * This function resumes the usual operation of the tuner after resume.
 *
- * In order to resume the frontend, it calls the demod
- * &dvb_frontend_ops.resume\(\) if available. Otherwise it calls demod
- * &dvb_frontend_ops.init\(\).
+ * In order to resume the frontend, it calls the demod &dvb_frontend_ops.init\(\).
 *
 * If &dvb_frontend_ops.tuner_ops.resume\(\) is available, It, it calls it.
 * Otherwise,t will call &dvb_frontend_ops.tuner_ops.init\(\), if available.
--- a/include/linux/media/dvb_ringbuffer.h
+++ b/include/linux/media/dvb_ringbuffer.h
@@ -214,7 +214,7 @@ extern ssize_t dvb_ringbuffer_write_user(struct dvb_ringbuffer *rbuf,
 * @buf: Buffer to write.
 * @len: Length of buffer (currently limited to 65535 bytes max).
 *
- * Return: Number of bytes written, or -EFAULT, -ENOMEM, -EINVAL.
+ * Return: Number of bytes written, or -EFAULT, -ENOMEM, -EVINAL.
 */
 extern ssize_t dvb_ringbuffer_pkt_write(struct dvb_ringbuffer *rbuf, u8 *buf,
 					size_t len);
--- a/include/linux/media/dvbdev.h
+++ b/include/linux/media/dvbdev.h
@@ -35,7 +35,7 @@
 #endif
 #endif

-#define DVB_MAX_ADAPTERS 64
+ #define DVB_MAX_ADAPTERS 64

 #define DVB_UNSET (-1)

@@ -96,11 +96,7 @@ struct dvb_frontend;
 * @device:		pointer to struct device
 * @module:		pointer to struct module
 * @mfe_shared:		indicates mutually exclusive frontends.
- *			1 = legacy exclusion behavior: blocking any open() call
- *			2 = enhanced exclusion behavior, emulating the standard
- *			behavior of busy frontends: allowing read-only sharing
- *			and otherwise returning immediately with -EBUSY when any
- *			of the frontends is already opened with write access.
+ *			Use of this flag is currently deprecated.
 * @mfe_dvbdev:		Frontend device in use, in the case of MFE
 * @mfe_lock:		Lock to prevent using the other frontends when MFE is
 *			used.
@@ -139,7 +135,6 @@ struct dvb_adapter {
 * struct dvb_device - represents a DVB device node
 *
 * @list_head:	List head with all DVB devices
- * @ref:	reference counter
 * @fops:	pointer to struct file_operations
 * @adapter:	pointer to the adapter that holds this device node
 * @type:	type of the device, as defined by &enum dvb_device_type.
@@ -170,7 +165,6 @@ struct dvb_adapter {
 */
 struct dvb_device {
 	struct list_head list_head;
-	struct kref ref;
 	const struct file_operations *fops;
 	struct dvb_adapter *adapter;
 	enum dvb_device_type type;
@@ -202,20 +196,6 @@ struct dvb_device {
 	void *priv;
 };

-/**
- * dvb_device_get - Increase dvb_device reference
- *
- * @dvbdev:	pointer to struct dvb_device
- */
-struct dvb_device *dvb_device_get(struct dvb_device *dvbdev);
-
-/**
- * dvb_device_put - Decrease dvb_device reference
- *
- * @dvbdev:	pointer to struct dvb_device
- */
-void dvb_device_put(struct dvb_device *dvbdev);
-
 /**
 * dvb_register_adapter - Registers a new DVB adapter
 *
@@ -260,16 +240,29 @@ int dvb_register_device(struct dvb_adapter *adap,
 /**
 * dvb_remove_device - Remove a registered DVB device
 *
- * This does not free memory. dvb_free_device() will do that when
- * reference counter is empty
+ * This does not free memory.  To do that, call dvb_free_device().
 *
 * @dvbdev:	pointer to struct dvb_device
 */
 void dvb_remove_device(struct dvb_device *dvbdev);

+/**
+ * dvb_free_device - Free memory occupied by a DVB device.
+ *
+ * Call dvb_unregister_device() before calling this function.
+ *
+ * @dvbdev:	pointer to struct dvb_device
+ */
+void dvb_free_device(struct dvb_device *dvbdev);
+
 /**
 * dvb_unregister_device - Unregisters a DVB device
 *
+ * This is a combination of dvb_remove_device() and dvb_free_device().
+ * Using this function is usually a mistake, and is often an indicator
+ * for a use-after-free bug (when a userspace process keeps a file
+ * handle to a detached device).
+ *
 * @dvbdev:	pointer to struct dvb_device
 */
 void dvb_unregister_device(struct dvb_device *dvbdev);
--- a/lib/ddzap.c
+++ b/lib/ddzap.c
@@ -391,10 +391,6 @@ int main(int argc, char **argv)
 				printf("unknown mtype %s\n", optarg);
 			break;
 		case 'd':
-			if (!strcmp(optarg, "C2"))
-				delsys = SYS_DVBC2;
-			if (!strcmp(optarg, "DVBC2"))
-				delsys = SYS_DVBC2;
 			if (!strcmp(optarg, "C"))
 				delsys = SYS_DVBC_ANNEX_A;
 			if (!strcmp(optarg, "DVBC"))
@@ -484,7 +480,7 @@ int main(int argc, char **argv)
 	else
 		fe = dddvb_fe_alloc(dd, delsys);
 	if (!fe) {
-		fprintf(fout,"dddvb_fe_alloc failed\n");
+	    fprintf(fout,"dddvb_fe_alloc failed\n");
 		exit(-1);
 	}
 	dddvb_param_init(&p);
--- a/lib/src/dddvb.c
+++ b/lib/src/dddvb.c
@@ -30,7 +30,7 @@ LIBDDDVB_EXPORTED struct dddvb_fe *dddvb_fe_alloc_num(struct dddvb *dd, uint32_t
 	pthread_mutex_unlock(&dd->lock);
 	if (dddvb_fe_start(fe) < 0) {
 		dbgprintf(DEBUG_SYS, "fe %d busy\n", fe->nr);
-		return NULL;
+		return 0;
 	}
 	dbgprintf(DEBUG_SYS, "Allocated fe %d = %d/%d, fd=%d\n",
 		  fe->nr, fe->anum, fe->fnum, fe->fd);
@@ -40,25 +40,22 @@ LIBDDDVB_EXPORTED struct dddvb_fe *dddvb_fe_alloc_num(struct dddvb *dd, uint32_t
 LIBDDDVB_EXPORTED struct dddvb_fe *dddvb_fe_alloc(struct dddvb *dd, uint32_t type)
 {
 	int i;
-	struct dddvb_fe *fe = NULL, *tfe;
+	struct dddvb_fe *fe = NULL;

 	pthread_mutex_lock(&dd->lock);
 	dbgprintf(DEBUG_SYS, "alloc_fe type %u\n", type);
 	for (i = 0; i < dd->dvbfe_num; i++) {
-		tfe = &dd->dvbfe[i];
-		if (tfe->state == 0 &&
-		    (tfe->type & (1UL << type))) {
+		fe = &dd->dvbfe[i];
+		if (fe->state == 0 && 
+		    (fe->type & (1UL << type))) {
 			fe = dddvb_fe_alloc_num(dd, type, i);
 			if (fe)
 				break;
 		}
 	}
 	pthread_mutex_unlock(&dd->lock);
-	if (!fe)
-		dbgprintf(DEBUG_SYS, "alloc_fe type %u\n failed!", type);
-	else
-		dbgprintf(DEBUG_SYS, "alloc_fe type %u success!\n", type);
 	return fe;
+
 }

 LIBDDDVB_EXPORTED int dddvb_dvb_tune(struct dddvb_fe *fe, struct dddvb_params *p)
--- a/lib/src/dvb.c
+++ b/lib/src/dvb.c
@@ -182,15 +182,6 @@ static int diseqc(int fd, int sat, int hor, int band)
 	return 0;
 }

-static int set_vol_tone(int fd, int hor, int band)
-{
-	if (ioctl(fd, FE_SET_TONE, band ? SEC_TONE_ON : SEC_TONE_OFF))
-		perror("FE_SET_TONE failed");
-	if (ioctl(fd, FE_SET_VOLTAGE, hor ? SEC_VOLTAGE_18 : SEC_VOLTAGE_13) == -1)
-		perror("FE_SET_VOLTAGE failed");
-	dbgprintf(DEBUG_DVB, "set_vol_tone hor=%u, band=%u\n", hor, band);
-}
-
 static int set_en50494(struct dddvb_fe *fe, uint32_t freq_khz, uint32_t sr, 
 		       int sat, int hor, int band, 
 		       uint32_t slot, uint32_t ubfreq,
@@ -346,11 +337,9 @@ static int tune_sat(struct dddvb_fe *fe)
 			dbgprintf(DEBUG_DVB, "input = %u\n", input);
 			set_property(fe->fd, DTV_INPUT, input);
 		}
-		if (fe->scif_type == 3)
-			set_vol_tone(fe->fd, fe->param.param[PARAM_POL], hi);
-		else
-			diseqc(fe->fd, lnb, fe->param.param[PARAM_POL], hi);
+		diseqc(fe->fd, lnb, fe->param.param[PARAM_POL], hi);
 		set_fe_input(fe, freq, fe->param.param[PARAM_SR], ds, input);
+		//set_fe_input(fe, freq, fe->param.param[PARAM_SR], ds, DDDVB_UNDEF);
 	}
 }

--- a/lib/src/dvb_quality.c
+++ b/lib/src/dvb_quality.c
@@ -329,7 +329,7 @@ static void calc_lq(struct dddvb_fe *fe)
 {
 	struct dtv_fe_stats st;
 	int64_t str, snr;
-	uint32_t mod, fec, ber_num, ber_den, trans, pilot = 0, quality = 0, freq, rate;
+	uint32_t mod, fec, ber_num, ber_den, trans, pilot = 0, quality = 0, freq;
 	
 	get_property(fe->fd, DTV_TRANSMISSION_MODE, &fe->pls_code);
 	dbgprintf(DEBUG_DVB, "fe%d: pls=0x%02x\n", fe->nr, fe->pls_code);
@@ -362,15 +362,15 @@ static void calc_lq(struct dddvb_fe *fe)
 	dbgprintf(DEBUG_DVB, "fe%d: snr=%lld ber=%llu/%llu\n",
 		  fe->nr, snr, ber_num, ber_den);
 	dbgprintf(DEBUG_DVB, "fe%d: fec=%u mod=%u\n", fe->nr, fec, mod);
-	get_property(fe->fd, DTV_FREQUENCY, &freq);
-	dbgprintf(DEBUG_DVB, "fe%d: actual frequency=%u\n", fe->nr, freq);
-	get_property(fe->fd, DTV_SYMBOL_RATE, &rate);
-	dbgprintf(DEBUG_DVB, "fe%d: actual symbol rate=%u\n", fe->nr, rate);
 	switch (fe->n_param.param[PARAM_MSYS]) {
 	case SYS_DVBS:
+		get_property(fe->fd, DTV_FREQUENCY, &freq);
+		dbgprintf(DEBUG_DVB, "fe%d: actual frequency=%u\n", fe->nr, freq);
 		quality = dvbsq(snr, fec, ber_num, ber_den);
 		break;
 	case SYS_DVBS2:
+		get_property(fe->fd, DTV_FREQUENCY, &freq);
+		dbgprintf(DEBUG_DVB, "fe%d: actual frequency=%u\n", fe->nr, freq);
 		quality = dvbs2q(snr, fec, mod, ber_num, ber_den);
 		break;
 	case SYS_DVBC_ANNEX_A:
Author	SHA1	Message	Date
internal	d0793274d2	Merge branch 'internal'	2022-03-22 15:23:26 +01:00
internal	fb4f263aa3	Merge branch 'internal'	2022-03-21 17:40:59 +01:00
rjkm	e9ccab3578	Merge branch 'internal'	2022-02-20 23:22:36 +01:00
rjkm	a5f3b75d0a	Merge branch 'internal'	2022-02-16 15:55:04 +01:00
rjkm	f02b135bdb	Merge branch 'internal'	2021-12-06 15:15:18 +01:00
rjkm	ec655e1438	Merge branch 'internal'	2021-09-23 15:07:58 +02:00
rjkm	81793729e6	Merge branch 'internal'	2021-09-19 19:06:35 +02:00
rjkm	8986494cd3	Merge branch 'internal'	2021-08-20 14:36:46 +02:00
rjkm	fbc39f71f4	Merge branch 'internal'	2021-08-09 09:04:33 +02:00
none	ccc13aed48	Merge branch 'internal'	2021-06-23 16:30:26 +02:00
none	0fe2c2feb3	Merge branch 'internal'	2021-06-22 20:52:59 +02:00
none	4a93d1056a	Merge branch 'internal'	2021-06-08 14:02:28 +02:00
none	bfddf62f64	Merge branch 'internal'	2021-06-08 10:49:43 +02:00
none	1d96274993	Merge branch 'internal'	2021-06-07 17:12:12 +02:00
none	23bdd90595	Merge branch 'internal'	2021-04-09 12:54:23 +02:00