dvb-apps.patch

tools for dgstation st cuberevo box

diff -urN dvb-apps.070723/lib/libdvbapi/dvbfe.c cuberevo/lib/libdvbapi/dvbfe.c
--- dvb-apps.070723/lib/libdvbapi/dvbfe.c	2007-07-23 17:31:17.000000000 +0900
+++ cuberevo/lib/libdvbapi/dvbfe.c	2008-01-10 14:35:11.000000000 +0900
@@ -88,8 +88,10 @@
 {
 	{ DVBFE_ATSC_MOD_QAM_64, QAM_64 },
 	{ DVBFE_ATSC_MOD_QAM_256, QAM_256 },
+#ifdef VSB_8
 	{ DVBFE_ATSC_MOD_VSB_8, VSB_8 },
 	{ DVBFE_ATSC_MOD_VSB_16, VSB_16 },
+#endif
 	{ DVBFE_ATSC_MOD_AUTO, QAM_AUTO },
 	{ -1, -1 }
 };
@@ -205,9 +207,11 @@
 		fehandle->type = DVBFE_TYPE_DVBT;
 		break;
 
+#ifdef FE_ATSC
 	case FE_ATSC:
 		fehandle->type = DVBFE_TYPE_ATSC;
 		break;
+#endif
 	}
 	fehandle->name = strndup(info.name, sizeof(info.name));
 
@@ -320,10 +324,12 @@
 				lookupval(kevent.parameters.u.ofdm.hierarchy_information, 1, dvbfe_dvbt_hierarchy_to_kapi);
 			break;
 
+#ifdef FE_ATSC
 		case FE_ATSC:
 			result->feparams.u.atsc.modulation =
 				lookupval(kevent.parameters.u.vsb.modulation, 1, dvbfe_atsc_mod_to_kapi);
 			break;
+#endif
 		}
 	}
 
@@ -384,9 +390,11 @@
 			lookupval(params->u.dvbt.hierarchy_information, 0, dvbfe_dvbt_hierarchy_to_kapi);
                 break;
 
+#ifdef FE_ATSC
 	case FE_ATSC:
 		kparams.u.vsb.modulation = lookupval(params->u.atsc.modulation, 0, dvbfe_atsc_mod_to_kapi);
 		break;
+#endif
 
 	default:
 		return -EINVAL;
@@ -525,6 +533,7 @@
 
 int dvbfe_do_dishnetworks_legacy_command(struct dvbfe_handle *fehandle, unsigned int cmd)
 {
+#ifdef FE_DISHNETWORK_SEND_LEGACY_CMD
 	int ret = 0;
 
 	ret = ioctl(fehandle->fd, FE_DISHNETWORK_SEND_LEGACY_CMD, cmd);
@@ -532,6 +541,9 @@
 		print(verbose, ERROR, 1, "IOCTL failed");
 
 	return ret;
+#else
+	return -EINVAL;
+#endif
 }
 
 int dvbfe_do_diseqc_command(struct dvbfe_handle *fehandle, uint8_t *data, uint8_t len)
diff -urN dvb-apps.070723/lib/libdvben50221/en50221_transport.c cuberevo/lib/libdvben50221/en50221_transport.c
--- dvb-apps.070723/lib/libdvben50221/en50221_transport.c	2007-07-23 17:31:17.000000000 +0900
+++ cuberevo/lib/libdvben50221/en50221_transport.c	2008-01-14 20:36:08.000000000 +0900
@@ -340,7 +340,11 @@
 	pthread_mutex_lock(&tl->global_lock);
 	if (tl->slots_changed) {
 		for (slot_id = 0; slot_id < tl->max_slots; slot_id++) {
-			if (tl->slots[slot_id].ca_hndl != -1) {
+			// do not poll for the same device
+			for (j=0; j<slot_id; j++)
+				if( tl->slot_pollfds[j].fd == tl->slots[slot_id].ca_hndl )
+					break;
+			if ((j == slot_id) && (tl->slots[slot_id].ca_hndl != -1)) {
 				tl->slot_pollfds[slot_id].fd = tl->slots[slot_id].ca_hndl;
 				tl->slot_pollfds[slot_id].events = POLLIN | POLLPRI | POLLERR;
 				tl->slot_pollfds[slot_id].revents = 0;
@@ -355,7 +359,7 @@
 	pthread_mutex_unlock(&tl->global_lock);
 
 	// anything happened?
-	if (poll(tl->slot_pollfds, tl->max_slots, 10) < 0) {
+	if (poll(tl->slot_pollfds, tl->max_slots, 300) < 0) {
 		tl->error_slot = -1;
 		tl->error = EN50221ERR_CAREAD;
 		return -1;
@@ -498,6 +502,12 @@
 					tl->error_slot = slot_id;
 					tl->error = EN50221ERR_TIMEOUT;
 					pthread_mutex_unlock(&tl->slots[slot_id].slot_lock);
+
+					printf("[DVB-APPS] %s() : tx time:%u, repos timeout:%u\n", 
+							__func__,
+							tl->slots[slot_id].connections[j].tx_time.tv_sec,
+							tl->slots[slot_id].response_timeout);
+
 					return -1;
 				}
 			}
diff -urN dvb-apps.070723/lib/libucsi/dvb/service_descriptor.h cuberevo/lib/libucsi/dvb/service_descriptor.h
--- dvb-apps.070723/lib/libucsi/dvb/service_descriptor.h	2007-07-23 17:31:17.000000000 +0900
+++ cuberevo/lib/libucsi/dvb/service_descriptor.h	2008-01-10 14:35:11.000000000 +0900
@@ -50,6 +50,13 @@
 	DVB_SERVICE_TYPE_RCS_MAP		= 0x0e,
 	DVB_SERVICE_TYPE_RCS_FLS		= 0x0f,
 	DVB_SERVICE_TYPE_MHP			= 0x10,
+	DVB_SERVICE_TYPE_MPEG2_HD_DIGITAL_TV	= 0x11,
+	DVB_SERVICE_TYPE_ADVANCED_CODEC_SD_DIGITAL_TV = 0x16,
+	DVB_SERVICE_TYPE_ADVANCED_CODEC_SD_NVOD_TIMESHIFT = 0x17,
+	DVB_SERVICE_TYPE_ADVANCED_CODEC_SD_NVOD_REF = 0x18,
+	DVB_SERVICE_TYPE_ADVANCED_CODEC_HD_DIGITAL_TV = 0x19,
+	DVB_SERVICE_TYPE_ADVANCED_CODEC_HD_NVOD_TIMESHIFT = 0x1a,
+	DVB_SERVICE_TYPE_ADVANCED_CODEC_HD_NVOD_REF = 0x1b,
 };
 
 /**
diff -urN dvb-apps.070723/lib/libucsi/mpeg/types.h cuberevo/lib/libucsi/mpeg/types.h
--- dvb-apps.070723/lib/libucsi/mpeg/types.h	2007-07-23 17:31:17.000000000 +0900
+++ cuberevo/lib/libucsi/mpeg/types.h	2008-01-10 14:35:11.000000000 +0900
@@ -55,6 +55,12 @@
 	MPEG_STREAM_TYPE_METADATA_DSMCC_DATA   = 0x17,
 	MPEG_STREAM_TYPE_METADATA_DSMCC_OBJECT = 0x18,
 	MPEG_STREAM_TYPE_METADATA_SYNCDOWNLOAD = 0x19,
+	MPEG_STREAM_TYPE_IPMP = 0x1a,
+	MPEG_STREAM_TYPE_AVC_VIDEO_H264 = 0x1b,
+	MPEG_STREAM_TYPE_ISO14496_3_AUDIO = 0x1c,
+	MPEG_STREAM_TYPE_ISO14496_17_TEXT = 0x1d,
+	MPEG_STREAM_TYPE_AUX_VIDEO_ISO23002_3 = 0x1e,
+	MPEG_STREAM_TYPE_AC3_AUDIO = 0x81,
 };
 
 /**
diff -urN dvb-apps.070723/Make.rules cuberevo/Make.rules
--- dvb-apps.070723/Make.rules	2007-07-23 17:31:17.000000000 +0900
+++ cuberevo/Make.rules	2008-01-10 14:35:11.000000000 +0900
@@ -28,6 +28,7 @@
 endif
 
 prefix ?= /usr
+kernelinc ?= /usr/include/
 
 bindir     ?= $(prefix)/bin
 includedir ?= $(prefix)/include
diff -urN dvb-apps.070723/util/av7110_loadkeys/generate-keynames.sh cuberevo/util/av7110_loadkeys/generate-keynames.sh
--- dvb-apps.070723/util/av7110_loadkeys/generate-keynames.sh	2007-07-23 17:31:18.000000000 +0900
+++ cuberevo/util/av7110_loadkeys/generate-keynames.sh	2008-01-10 14:35:11.000000000 +0900
@@ -18,7 +18,7 @@
 echo >> $1
 echo >> $1
 echo "static struct input_key_name key_name [] = {" >> $1
-for x in $(cat /usr/include/linux/input.h input_fake.h | \
+for x in $(cat $2/linux/input.h input_fake.h | \
            egrep "#define[ \t]+KEY_" | grep -v KEY_MAX | \
            cut -f 1 | cut -f 2 -d " " | sort -u) ; do
     echo "        { \"$(echo $x | cut -b 5-)\", $x }," >> $1
@@ -26,7 +26,7 @@
 echo "};" >> $1
 echo >> $1
 echo "static struct input_key_name btn_name [] = {" >> $1
-for x in $(cat /usr/include/linux/input.h input_fake.h | \
+for x in $(cat $2/linux/input.h input_fake.h | \
            egrep "#define[ \t]+BTN_" | \
            cut -f 1 | cut -f 2 -d " " | sort -u) ; do
      echo "        { \"$(echo $x | cut -b 5-)\", $x }," >> $1
diff -urN dvb-apps.070723/util/av7110_loadkeys/Makefile cuberevo/util/av7110_loadkeys/Makefile
--- dvb-apps.070723/util/av7110_loadkeys/Makefile	2007-07-23 17:31:18.000000000 +0900
+++ cuberevo/util/av7110_loadkeys/Makefile	2008-01-10 14:35:11.000000000 +0900
@@ -1,3 +1,4 @@
+
 # Makefile for linuxtv.org dvb-apps/util/av7110_loadkeys
 
 binaries = av7110_loadkeys
@@ -13,7 +14,7 @@
 $(binaries): input_keynames.h
 
 input_keynames.h:
-	$(SHELL) generate-keynames.sh $@
+	$(SHELL) generate-keynames.sh $@ $(kernelinc)
 
 include ../../Make.rules