From patchwork Tue Sep 30 15:17:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregor Jasny X-Patchwork-Id: 26244 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1XYzBM-000062-8r; Tue, 30 Sep 2014 17:17:40 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.72/mailfrontend-5) with esmtp id 1XYzBJ-0007DA-9Y; Tue, 30 Sep 2014 17:17:40 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751971AbaI3PRe (ORCPT + 1 other); Tue, 30 Sep 2014 11:17:34 -0400 Received: from mail-we0-f175.google.com ([74.125.82.175]:47382 "EHLO mail-we0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751452AbaI3PRc (ORCPT ); Tue, 30 Sep 2014 11:17:32 -0400 Received: by mail-we0-f175.google.com with SMTP id q59so4068842wes.34 for ; Tue, 30 Sep 2014 08:17:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Sp2nBdjrsnOa5GXZbjzz1QEsZoQLAqLNScHm0QQRZxc=; b=LTLOzqqVacVMzAW6UbTJn5QeOUPWTI1IKfSo+R4fDbh2x0ZBriOv7Ss5WuNG2WvACD 2juw9MvaW4YPxI4KvUcgmHAq4MOwdDc/DyKw4+P0NOUna8Unj6pvTm5JZF2uplkROczs uvL5vc41CQwqC5+DxpZ5C2dSHc4lIVGa11qqd8Z7SSpp16d7zbOYk2Ixos6YwOLd3miW y2SuL6BSnPOshy5W3M4VcvQm5YcmPTArCPYLj4z9UiwAXnxSeE0oO494IyTQDhogHFRr ShhyHcjobhRYfUEBMjwXpp1HXC4satEZQjhMg9Og0sJVarATowhnbbmk02R1PfOj4LIk ltEg== X-Received: by 10.194.57.237 with SMTP id l13mr14512486wjq.102.1412090251254; Tue, 30 Sep 2014 08:17:31 -0700 (PDT) Received: from sid.home ([95.91.248.53]) by mx.google.com with ESMTPSA id bl9sm11575450wib.24.2014.09.30.08.17.30 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 30 Sep 2014 08:17:30 -0700 (PDT) From: Gregor Jasny To: linux-media@vger.kernel.org Cc: Gregor Jasny , Andre Roth Subject: [PATCH 3/3] libdvbv5: remove service_list descriptor Date: Tue, 30 Sep 2014 17:17:08 +0200 Message-Id: <1412090228-19996-4-git-send-email-gjasny@googlemail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1412090228-19996-1-git-send-email-gjasny@googlemail.com> References: <1412090228-19996-1-git-send-email-gjasny@googlemail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2014.9.30.150919 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, DKIM_SIGNATURE 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __STOCK_PHRASE_24 0, __SUBJ_ALPHA_END 0, __SUBJ_ALPHA_NEGATE 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NS , __YOUTUBE_RCVD 0' CC: Andre Roth Signed-off-by: Gregor Jasny --- 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 - * - * 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 - -/** - * @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 #include #include -#include #include #include #include @@ -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 - * - * 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 -#include - -/* 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;*/ - /*}*/ -} -