* [PATCH 1/3] libdvbv5: Add todo file
2014-09-30 15:17 [PATCH 0/3] libdvbv5: Remove broken descriptor parsers Gregor Jasny
@ 2014-09-30 15:17 ` Gregor Jasny
2014-09-30 15:17 ` [PATCH 2/3] libdvbv5: remove service_location descriptor Gregor Jasny
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Gregor Jasny @ 2014-09-30 15:17 UTC (permalink / raw)
To: linux-media; +Cc: Gregor Jasny
Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
---
TODO.libdvbv5 | 2 ++
1 file changed, 2 insertions(+)
create mode 100644 TODO.libdvbv5
diff --git a/TODO.libdvbv5 b/TODO.libdvbv5
new file mode 100644
index 0000000..21091c4
--- /dev/null
+++ b/TODO.libdvbv5
@@ -0,0 +1,2 @@
+- On next SONAME bump
+ - clean up dvb_fe_open* and re-apply 9eaa2327da63fffd0dcaaa02b7641e66f881e20d
--
2.1.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/3] libdvbv5: remove service_location descriptor
2014-09-30 15:17 [PATCH 0/3] libdvbv5: Remove broken descriptor parsers Gregor Jasny
2014-09-30 15:17 ` [PATCH 1/3] libdvbv5: Add todo file Gregor Jasny
@ 2014-09-30 15:17 ` Gregor Jasny
2014-09-30 15:17 ` [PATCH 3/3] libdvbv5: remove service_list descriptor Gregor Jasny
2014-10-01 0:38 ` [PATCH 0/3] libdvbv5: Remove broken descriptor parsers Mauro Carvalho Chehab
3 siblings, 0 replies; 5+ messages in thread
From: Gregor Jasny @ 2014-09-30 15:17 UTC (permalink / raw)
To: linux-media; +Cc: Gregor Jasny, Andre Roth
CC: Andre Roth <neolynx@gmail.com>
Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
---
TODO.libdvbv5 | 1 +
lib/include/libdvbv5/desc_service_location.h | 107 -----------------------
lib/libdvbv5/Makefile.am | 3 +-
lib/libdvbv5/compat-soname.c | 36 ++++++++
lib/libdvbv5/descriptors/desc_service_location.c | 80 -----------------
5 files changed, 38 insertions(+), 189 deletions(-)
delete mode 100644 lib/include/libdvbv5/desc_service_location.h
create mode 100644 lib/libdvbv5/compat-soname.c
delete mode 100644 lib/libdvbv5/descriptors/desc_service_location.c
diff --git a/TODO.libdvbv5 b/TODO.libdvbv5
index 21091c4..6fa294a 100644
--- a/TODO.libdvbv5
+++ b/TODO.libdvbv5
@@ -1,2 +1,3 @@
- On next SONAME bump
- clean up dvb_fe_open* and re-apply 9eaa2327da63fffd0dcaaa02b7641e66f881e20d
+ - remove content of compat-soname.c
\ No newline at end of file
diff --git a/lib/include/libdvbv5/desc_service_location.h b/lib/include/libdvbv5/desc_service_location.h
deleted file mode 100644
index ca09241..0000000
--- a/lib/include/libdvbv5/desc_service_location.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright (c) 2013 - Andre Roth <neolynx@gmail.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 version 2
- * of the License.
- *
- * 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/licenses/old-licenses/gpl-2.0.html
- *
- */
-
-/**
- * @file desc_service_location.h
- * @ingroup descriptors
- * @brief Provides the descriptors for the DVB service location
- * @copyright GNU General Public License version 2 (GPLv2)
- * @author Andre Roth
- *
- * @par Relevant specs
- * The descriptor described herein is defined at:
- *
- * @par Bug Report
- * Please submit bug reports and patches to linux-media@vger.kernel.org
- *
- * @todo DOES THIS DESCRIPTOR EXISTS? IF SO, WHERE?
- *
- * FIXME: this seems to be a duplicated copy of the ATSC service location.
- */
-
-#ifndef _SERVICE_LOCATION_H
-#define _SERVICE_LOCATION_H
-
-#include <libdvbv5/descriptors.h>
-
-/**
- * @struct dvb_desc_service_location_element
- * @ingroup descriptors
- * @brief
- *
- * @param stream_type stream type
- * @param elementary_pid elementary pid
- * @param language language
- */
-struct dvb_desc_service_location_element {
- uint8_t stream_type;
- union {
- uint16_t bitfield;
- struct {
- uint16_t elementary_pid:13;
- uint16_t reserved:3;
- } __attribute__((packed));
- } __attribute__((packed));
- uint8_t language[4];
-} __attribute__((packed));
-
-/**
- * @struct dvb_desc_service_location
- * @ingroup descriptors
- * @brief
- *
- * @param type type
- * @param length length
- * @param next pointer to struct dvb_desc
- * @param pcr_pid pcr pid
- * @param elements elements
- * @param element pointer to struct dvb_desc_service_location_element
- */
-struct dvb_desc_service_location {
- uint8_t type;
- uint8_t length;
- struct dvb_desc *next;
-
- union {
- uint16_t bitfield;
- struct {
- uint16_t pcr_pid:13;
- uint16_t reserved:3;
- } __attribute__((packed));
- } __attribute__((packed));
- uint8_t elements;
- struct dvb_desc_service_location_element *element;
-} __attribute__((packed));
-
-struct dvb_v5_fe_parms;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int dvb_desc_service_location_init (struct dvb_v5_fe_parms *parms, const uint8_t *buf, struct dvb_desc *desc);
-void dvb_desc_service_location_print(struct dvb_v5_fe_parms *parms, const struct dvb_desc *desc);
-void dvb_desc_service_location_free (struct dvb_desc *desc);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib/libdvbv5/Makefile.am b/lib/libdvbv5/Makefile.am
index fd21236..037c153 100644
--- a/lib/libdvbv5/Makefile.am
+++ b/lib/libdvbv5/Makefile.am
@@ -34,7 +34,6 @@ otherinclude_HEADERS = \
../include/libdvbv5/desc_logical_channel.h \
../include/libdvbv5/desc_ts_info.h \
../include/libdvbv5/desc_partial_reception.h \
- ../include/libdvbv5/desc_service_location.h \
../include/libdvbv5/desc_ca.h \
../include/libdvbv5/desc_ca_identifier.h \
../include/libdvbv5/nit.h \
@@ -56,6 +55,7 @@ noinst_LTLIBRARIES = libdvbv5.la
endif
libdvbv5_la_SOURCES = \
+ compat-soname.c \
crc32.c \
dvb-legacy-channel-format.c \
dvb-zap-format.c \
@@ -104,7 +104,6 @@ libdvbv5_la_SOURCES = \
descriptors/desc_logical_channel.c \
descriptors/desc_ts_info.c \
descriptors/desc_partial_reception.c \
- descriptors/desc_service_location.c \
descriptors/desc_ca.c \
descriptors/desc_ca_identifier.c
diff --git a/lib/libdvbv5/compat-soname.c b/lib/libdvbv5/compat-soname.c
new file mode 100644
index 0000000..e9f534a
--- /dev/null
+++ b/lib/libdvbv5/compat-soname.c
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2013 - Andre Roth <neolynx@gmail.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 version 2
+ * of the License.
+ *
+ * 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/licenses/old-licenses/gpl-2.0.html
+ *
+ */
+
+#include <libdvbv5/descriptors.h>
+#include <libdvbv5/dvb-fe.h>
+
+int dvb_desc_service_location_init(struct dvb_v5_fe_parms *parms, const uint8_t *buf, struct dvb_desc *desc)
+{
+ return -1;
+}
+
+void dvb_desc_service_location_print(struct dvb_v5_fe_parms *parms, const struct dvb_desc *desc)
+{
+}
+
+void dvb_desc_service_location_free(struct dvb_desc *desc)
+{
+}
+
diff --git a/lib/libdvbv5/descriptors/desc_service_location.c b/lib/libdvbv5/descriptors/desc_service_location.c
deleted file mode 100644
index 95cb342..0000000
--- a/lib/libdvbv5/descriptors/desc_service_location.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 2013 - Andre Roth <neolynx@gmail.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 version 2
- * of the License.
- *
- * 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/licenses/old-licenses/gpl-2.0.html
- *
- */
-
-#include <libdvbv5/desc_service_location.h>
-#include <libdvbv5/descriptors.h>
-#include <libdvbv5/dvb-fe.h>
-
-int dvb_desc_service_location_init(struct dvb_v5_fe_parms *parms, const uint8_t *buf, struct dvb_desc *desc)
-{
- struct dvb_desc_service_location *service_location = (struct dvb_desc_service_location *) desc;
- const uint8_t *endbuf = buf + desc->length;
- ssize_t size = sizeof(struct dvb_desc_service_location) - sizeof(struct dvb_desc);
- struct dvb_desc_service_location_element *element;
- int i;
-
- if (buf + size > endbuf) {
- dvb_logerr("%s: short read %zd/%zd bytes", __FUNCTION__, endbuf - buf, size);
- return -1;
- }
-
- memcpy(desc->data, buf, size);
- bswap16(service_location->bitfield);
- buf += size;
-
- if (service_location->elements == 0)
- return 0;
-
- size = service_location->elements * sizeof(struct dvb_desc_service_location_element);
- if (buf + size > endbuf) {
- dvb_logerr("%s: short read %zd/%zd bytes", __FUNCTION__, endbuf - buf, size);
- return -2;
- }
- service_location->element = malloc(size);
- element = service_location->element;
- for (i = 0; i < service_location->elements; i++) {
- memcpy(element, buf, sizeof(struct dvb_desc_service_location_element) - 1); /* no \0 in lang */
- buf += sizeof(struct dvb_desc_service_location_element) - 1;
- element->language[3] = '\0';
- bswap16(element->bitfield);
- element++;
- }
- return 0;
-}
-
-void dvb_desc_service_location_print(struct dvb_v5_fe_parms *parms, const struct dvb_desc *desc)
-{
- const struct dvb_desc_service_location *service_location = (const struct dvb_desc_service_location *) desc;
- struct dvb_desc_service_location_element *element = service_location->element;
- int i;
-
- dvb_loginfo("| pcr pid %d", service_location->pcr_pid);
- dvb_loginfo("| streams:");
- for (i = 0; i < service_location->elements; i++)
- dvb_loginfo("| pid %d, type %d: %s", element[i].elementary_pid, element[i].stream_type, element[i].language);
- dvb_loginfo("| %d elements", service_location->elements);
-}
-
-void dvb_desc_service_location_free(struct dvb_desc *desc)
-{
- const struct dvb_desc_service_location *service_location = (const struct dvb_desc_service_location *) desc;
-
- free(service_location->element);
-}
--
2.1.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 3/3] libdvbv5: remove service_list descriptor
2014-09-30 15:17 [PATCH 0/3] libdvbv5: Remove broken descriptor parsers Gregor Jasny
2014-09-30 15:17 ` [PATCH 1/3] libdvbv5: Add todo file Gregor Jasny
2014-09-30 15:17 ` [PATCH 2/3] libdvbv5: remove service_location descriptor Gregor Jasny
@ 2014-09-30 15:17 ` Gregor Jasny
2014-10-01 0:38 ` [PATCH 0/3] libdvbv5: Remove broken descriptor parsers Mauro Carvalho Chehab
3 siblings, 0 replies; 5+ messages in thread
From: Gregor Jasny @ 2014-09-30 15:17 UTC (permalink / raw)
To: linux-media; +Cc: Gregor Jasny, Andre Roth
CC: Andre Roth <neolynx@gmail.com>
Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
---
doxygen_libdvbv5.cfg | 1 -
lib/include/libdvbv5/desc_service_list.h | 119 ---------------------------
lib/libdvbv5/Makefile.am | 2 -
lib/libdvbv5/compat-soname.c | 8 ++
lib/libdvbv5/descriptors.c | 8 --
lib/libdvbv5/descriptors/desc_service_list.c | 56 -------------
6 files changed, 8 insertions(+), 186 deletions(-)
delete mode 100644 lib/include/libdvbv5/desc_service_list.h
delete mode 100644 lib/libdvbv5/descriptors/desc_service_list.c
diff --git a/doxygen_libdvbv5.cfg b/doxygen_libdvbv5.cfg
index 0c3c24e..21c3626 100644
--- a/doxygen_libdvbv5.cfg
+++ b/doxygen_libdvbv5.cfg
@@ -783,7 +783,6 @@ INPUT = $(SRCDIR)/doc/libdvbv5-index.doc \
$(SRCDIR)/lib/include/libdvbv5/desc_partial_reception.h \
$(SRCDIR)/lib/include/libdvbv5/desc_sat.h \
$(SRCDIR)/lib/include/libdvbv5/desc_service.h \
- $(SRCDIR)/lib/include/libdvbv5/desc_service_list.h \
$(SRCDIR)/lib/include/libdvbv5/desc_t2_delivery.h \
$(SRCDIR)/lib/include/libdvbv5/desc_terrestrial_delivery.h \
$(SRCDIR)/lib/include/libdvbv5/desc_ts_info.h \
diff --git a/lib/include/libdvbv5/desc_service_list.h b/lib/include/libdvbv5/desc_service_list.h
deleted file mode 100644
index dfcb596..0000000
--- a/lib/include/libdvbv5/desc_service_list.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) 2012 - Andre Roth <neolynx@gmail.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 version 2
- * of the License.
- *
- * 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/licenses/old-licenses/gpl-2.0.html
- *
- */
-
-/**
- * @file desc_service_list.h
- * @ingroup descriptors
- * @brief Provides the descriptors for the service list descriptor
- * @copyright GNU General Public License version 2 (GPLv2)
- * @author Andre Roth
- *
- * @par Relevant specs
- * The descriptor described herein is defined at:
- * - ETSI EN 300 468 V1.11.1
- *
- * @par Bug Report
- * Please submit bug reports and patches to linux-media@vger.kernel.org
- *
- * @todo Properly implement a parser for this descriptor. However, this
- * will break the API.
- */
-
-#ifndef _DESC_SERVICE_LIST_H
-#define _DESC_SERVICE_LIST_H
-
-#include <libdvbv5/descriptors.h>
-
-/**
- * @struct dvb_desc_service_list_table
- * @ingroup descriptors
- * @brief Structure containing the service list table
- *
- * @param service_id service id
- * @param service_type service type
- */
-struct dvb_desc_service_list_table {
- uint16_t service_id;
- uint8_t service_type;
-} __attribute__((packed));
-
-/**
- * @struct dvb_desc_service_list
- * @ingroup descriptors
- * @brief Structure containing the service list descriptor
- *
- * @param type descriptor tag
- * @param length descriptor length
- * @param next pointer to struct dvb_desc
- *
- * @bug Currently, the service list is not properly parsed, as the
- * struct dvb_desc_service_list_table pointer is commented.
- */
-struct dvb_desc_service_list {
- uint8_t type;
- uint8_t length;
- struct dvb_desc *next;
-
- /* FIXME */
- /* struct dvb_desc_service_list_table services[]; */
-} __attribute__((packed));
-
-struct dvb_v5_fe_parms;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @brief Initializes and parses the service list descriptor
- * @ingroup descriptors
- *
- * @param parms struct dvb_v5_fe_parms pointer to the opened device
- * @param buf buffer containing the descriptor's raw data
- * @param desc pointer to struct dvb_desc to be allocated and filled
- *
- * This function initializes and makes sure that all fields will follow the CPU
- * endianness. Due to that, the content of the buffer may change.
- *
- * Currently, no memory is allocated internally.
- *
- * @return On success, it returns the size of the allocated struct.
- * A negative value indicates an error.
- */
-int dvb_desc_service_list_init(struct dvb_v5_fe_parms *parms,
- const uint8_t *buf, struct dvb_desc *desc);
-
-/**
- * @brief Prints the content of the service list descriptor
- * @ingroup descriptors
- *
- * @param parms struct dvb_v5_fe_parms pointer to the opened device
- * @param desc pointer to struct dvb_desc
- *
- * @bug Currently, it does nothing.
- */
-void dvb_desc_service_list_print(struct dvb_v5_fe_parms *parms,
- const struct dvb_desc *desc);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib/libdvbv5/Makefile.am b/lib/libdvbv5/Makefile.am
index 037c153..f126dc5 100644
--- a/lib/libdvbv5/Makefile.am
+++ b/lib/libdvbv5/Makefile.am
@@ -24,7 +24,6 @@ otherinclude_HEADERS = \
../include/libdvbv5/desc_t2_delivery.h \
../include/libdvbv5/desc_service.h \
../include/libdvbv5/desc_frequency_list.h \
- ../include/libdvbv5/desc_service_list.h \
../include/libdvbv5/desc_event_short.h \
../include/libdvbv5/desc_event_extended.h \
../include/libdvbv5/desc_atsc_service_location.h \
@@ -94,7 +93,6 @@ libdvbv5_la_SOURCES = \
descriptors/desc_t2_delivery.c \
descriptors/desc_service.c \
descriptors/desc_frequency_list.c \
- descriptors/desc_service_list.c \
descriptors/desc_event_short.c \
descriptors/desc_event_extended.c \
descriptors/desc_atsc_service_location.c \
diff --git a/lib/libdvbv5/compat-soname.c b/lib/libdvbv5/compat-soname.c
index e9f534a..f021c9b 100644
--- a/lib/libdvbv5/compat-soname.c
+++ b/lib/libdvbv5/compat-soname.c
@@ -34,3 +34,11 @@ void dvb_desc_service_location_free(struct dvb_desc *desc)
{
}
+int dvb_desc_service_list_init(struct dvb_v5_fe_parms *parms, const uint8_t *buf, struct dvb_desc *desc)
+{
+ return -1;
+}
+
+void dvb_desc_service_list_print(struct dvb_v5_fe_parms *parms, const struct dvb_desc *desc)
+{
+}
diff --git a/lib/libdvbv5/descriptors.c b/lib/libdvbv5/descriptors.c
index 63ce939..0a42fe9 100644
--- a/lib/libdvbv5/descriptors.c
+++ b/lib/libdvbv5/descriptors.c
@@ -45,7 +45,6 @@
#include <libdvbv5/desc_terrestrial_delivery.h>
#include <libdvbv5/desc_isdbt_delivery.h>
#include <libdvbv5/desc_service.h>
-#include <libdvbv5/desc_service_list.h>
#include <libdvbv5/desc_frequency_list.h>
#include <libdvbv5/desc_event_short.h>
#include <libdvbv5/desc_event_extended.h>
@@ -458,13 +457,6 @@ const struct dvb_descriptor dvb_descriptors[] = {
.free = dvb_desc_network_name_free,
.size = sizeof(struct dvb_desc_network_name),
},
- [service_list_descriptor] = {
- .name = "service_list_descriptor",
- .init = dvb_desc_service_list_init,
- .print = dvb_desc_service_list_print,
- .free = NULL,
- .size = sizeof(struct dvb_desc_service_list),
- },
[stuffing_descriptor] = {
.name = "stuffing_descriptor",
.init = NULL,
diff --git a/lib/libdvbv5/descriptors/desc_service_list.c b/lib/libdvbv5/descriptors/desc_service_list.c
deleted file mode 100644
index 4cd4018..0000000
--- a/lib/libdvbv5/descriptors/desc_service_list.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2011-2012 - Mauro Carvalho Chehab
- * Copyright (c) 2012 - Andre Roth <neolynx@gmail.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 version 2
- * of the License.
- *
- * 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/licenses/old-licenses/gpl-2.0.html
- *
- */
-
-#include <libdvbv5/desc_service_list.h>
-#include <libdvbv5/dvb-fe.h>
-
-/* FIXME: implement */
-
-int dvb_desc_service_list_init(struct dvb_v5_fe_parms *parms, const uint8_t *buf, struct dvb_desc *desc)
-{
- /*struct dvb_desc_service_list *slist = (struct dvb_desc_service_list *) desc;*/
-
- /*memcpy( slist->services, buf, slist->length);*/
- /*[> close the list <]*/
- /*slist->services[slist->length / sizeof(struct dvb_desc_service_list_table)].service_id = 0;*/
- /*slist->services[slist->length / sizeof(struct dvb_desc_service_list_table)].service_type = 0;*/
- /*[> swap the ids <]*/
- /*int i;*/
- /*for( i = 0; slist->services[i].service_id != 0; ++i) {*/
- /*bswap16(slist->services[i].service_id);*/
- /*}*/
-
- /*return sizeof(struct dvb_desc_service_list) + slist->length + sizeof(struct dvb_desc_service_list_table);*/
- /* FIXME: make linked list */
- return 0;
-}
-
-void dvb_desc_service_list_print(struct dvb_v5_fe_parms *parms, const struct dvb_desc *desc)
-{
- /*const struct dvb_desc_service_list *slist = (const struct dvb_desc_service_list *) desc;*/
- /*int i = 0;*/
- /*while(slist->services[i].service_id != 0) {*/
- /*dvb_loginfo("| service id : '%d'", slist->services[i].service_id);*/
- /*dvb_loginfo("| service type : '%d'", slist->services[i].service_type);*/
- /*++i;*/
- /*}*/
-}
-
--
2.1.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 0/3] libdvbv5: Remove broken descriptor parsers
2014-09-30 15:17 [PATCH 0/3] libdvbv5: Remove broken descriptor parsers Gregor Jasny
` (2 preceding siblings ...)
2014-09-30 15:17 ` [PATCH 3/3] libdvbv5: remove service_list descriptor Gregor Jasny
@ 2014-10-01 0:38 ` Mauro Carvalho Chehab
3 siblings, 0 replies; 5+ messages in thread
From: Mauro Carvalho Chehab @ 2014-10-01 0:38 UTC (permalink / raw)
To: Gregor Jasny; +Cc: linux-media
Em Tue, 30 Sep 2014 17:17:05 +0200
Gregor Jasny <gjasny@googlemail.com> escreveu:
> Hello,
>
> this patch series removes the service_list and service_location
> descriptors. It breaks API compatibility by removing the public
> header files but maintains ABI compatibility by providing stub
> implementations.
>
> Thanks,
> Gregor
>
> Gregor Jasny (3):
> libdvbv5: Add todo file
> libdvbv5: remove service_location descriptor
> libdvbv5: remove service_list descriptor
>
> TODO.libdvbv5 | 3 +
> doxygen_libdvbv5.cfg | 1 -
> lib/include/libdvbv5/desc_service_list.h | 119 -----------------------
> lib/include/libdvbv5/desc_service_location.h | 107 --------------------
> lib/libdvbv5/Makefile.am | 5 +-
> lib/libdvbv5/compat-soname.c | 44 +++++++++
> lib/libdvbv5/descriptors.c | 8 --
> lib/libdvbv5/descriptors/desc_service_list.c | 56 -----------
> lib/libdvbv5/descriptors/desc_service_location.c | 80 ---------------
> 9 files changed, 48 insertions(+), 375 deletions(-)
> create mode 100644 TODO.libdvbv5
> delete mode 100644 lib/include/libdvbv5/desc_service_list.h
> delete mode 100644 lib/include/libdvbv5/desc_service_location.h
> create mode 100644 lib/libdvbv5/compat-soname.c
> delete mode 100644 lib/libdvbv5/descriptors/desc_service_list.c
> delete mode 100644 lib/libdvbv5/descriptors/desc_service_location.c
For all three patches on this series:
Acked-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Regards,
Mauro
>
--
Cheers,
Mauro
^ permalink raw reply [flat|nested] 5+ messages in thread