From patchwork Sun Nov 2 12:01:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akihiro TSUKADA X-Patchwork-Id: 26694 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1XktrW-0002zB-8o; Sun, 02 Nov 2014 13:02:26 +0100 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-6) with esmtp id 1XktrS-0000yy-5B; Sun, 02 Nov 2014 13:02:25 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752105AbaKBMCU (ORCPT + 1 other); Sun, 2 Nov 2014 07:02:20 -0500 Received: from mail-pd0-f179.google.com ([209.85.192.179]:50494 "EHLO mail-pd0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751103AbaKBMCS (ORCPT ); Sun, 2 Nov 2014 07:02:18 -0500 Received: by mail-pd0-f179.google.com with SMTP id g10so9969067pdj.10 for ; Sun, 02 Nov 2014 04:02:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=XDEd7hZYPDZVCDoU+ve6Kqkd/siXP0TD5a4pCIRAFZk=; b=R+NID0cfyu+xIt1DrLGgfKKSugLYsQRXPwdYmAso9nkbKn+qnCbLpdf/0U+70wxbQ3 u5NuOSwHdKQ64EKbvmB+EriTbtBeFI3xVLpJGMCUR5Hb02aDhuHPr4vy2lmUgyUBC/0n FdyJhO5zGvHUSE93oPjSgOD7/My86bfLisG2Qbn8cZ/POdFM5jk0Hq221BOzrkiOSfvk l7J4O5SbYLPSD9RKxRuiHTum8IRL6GQO52n6yoVSfD9Zgp2ehNSTx82K8aZPNYdflBiq +VScymOswz04GrKF7Ga31TK9hu7zqkXxT2Vl8MTav3uRTrbKC3v1mXxmDKb1Jd/qR28r ojNQ== X-Received: by 10.68.235.103 with SMTP id ul7mr36764629pbc.63.1414929737920; Sun, 02 Nov 2014 04:02:17 -0800 (PST) Received: from seabird.localdomain.localdomain (softbank219203027033.bbtec.net. [219.203.27.33]) by mx.google.com with ESMTPSA id zn2sm14477818pbb.41.2014.11.02.04.02.15 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 02 Nov 2014 04:02:17 -0800 (PST) From: tskd08@gmail.com To: linux-media@vger.kernel.org Cc: m.chehab@samsung.com, Akihiro Tsukada Subject: [PATCH] v4l-utils/libdvbv5: restore deleted functions to keep API/ABI compatible Date: Sun, 2 Nov 2014 21:01:59 +0900 Message-Id: <1414929719-11748-1-git-send-email-tskd08@gmail.com> X-Mailer: git-send-email 2.1.3 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.11.2.115419 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' FORGED_FROM_GMAIL 0.1, MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODY_SIZE_5000_5999 0, BODY_SIZE_7000_LESS 0, DKIM_SIGNATURE 0, NO_REAL_NAME 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, __FROM_GMAIL 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' From: Akihiro Tsukada dvb_new_freq_is_needed() was integrated to dvb_new_entry_is_needed(), and dvb_scan_add_entry() was added a new parameter. As those changes broke API/ABI compatibility, restore the original functions. Signed-off-by: Akihiro Tsukada --- lib/include/libdvbv5/dvb-scan.h | 21 ++++++++++++----- lib/libdvbv5/dvb-scan.c | 50 +++++++++++++++++++++++++++-------------- 2 files changed, 48 insertions(+), 23 deletions(-) diff --git a/lib/include/libdvbv5/dvb-scan.h b/lib/include/libdvbv5/dvb-scan.h index aad6d01..c480426 100644 --- a/lib/include/libdvbv5/dvb-scan.h +++ b/lib/include/libdvbv5/dvb-scan.h @@ -385,17 +385,26 @@ void dvb_add_scaned_transponders(struct dvb_v5_fe_parms *parms, */ int dvb_estimate_freq_shift(struct dvb_v5_fe_parms *parms); -int dvb_new_entry_is_needed(struct dvb_entry *entry, - struct dvb_entry *last_entry, - uint32_t freq, int shift, - enum dvb_sat_polarization pol, uint32_t stream_id); +int dvb_new_freq_is_needed(struct dvb_entry *entry, struct dvb_entry *last_entry, + uint32_t freq, enum dvb_sat_polarization pol, int shift); struct dvb_entry *dvb_scan_add_entry(struct dvb_v5_fe_parms *parms, struct dvb_entry *first_entry, struct dvb_entry *entry, uint32_t freq, uint32_t shift, - enum dvb_sat_polarization pol, - uint32_t stream_id); + enum dvb_sat_polarization pol); + +int dvb_new_entry_is_needed(struct dvb_entry *entry, + struct dvb_entry *last_entry, + uint32_t freq, int shift, + enum dvb_sat_polarization pol, uint32_t stream_id); + +struct dvb_entry *dvb_scan_add_entry_ex(struct dvb_v5_fe_parms *parms, + struct dvb_entry *first_entry, + struct dvb_entry *entry, + uint32_t freq, uint32_t shift, + enum dvb_sat_polarization pol, + uint32_t stream_id); void dvb_update_transponders(struct dvb_v5_fe_parms *parms, struct dvb_v5_descriptors *dvb_scan_handler, diff --git a/lib/libdvbv5/dvb-scan.c b/lib/libdvbv5/dvb-scan.c index 6c94e8d..637c64e 100644 --- a/lib/libdvbv5/dvb-scan.c +++ b/lib/libdvbv5/dvb-scan.c @@ -693,6 +693,23 @@ int dvb_estimate_freq_shift(struct dvb_v5_fe_parms *__p) return shift; } +int dvb_new_freq_is_needed(struct dvb_entry *entry, struct dvb_entry *last_entry, + uint32_t freq, enum dvb_sat_polarization pol, int shift) +{ + return dvb_new_entry_is_needed(entry, last_entry, freq, shift, + pol, NO_STREAM_ID_FILTER); +} + +struct dvb_entry *dvb_scan_add_entry(struct dvb_v5_fe_parms *__p, + struct dvb_entry *first_entry, + struct dvb_entry *entry, + uint32_t freq, uint32_t shift, + enum dvb_sat_polarization pol) +{ + return dvb_scan_add_entry_ex(__p, first_entry, entry, freq, shift, + pol, NO_STREAM_ID_FILTER); +} + int dvb_new_entry_is_needed(struct dvb_entry *entry, struct dvb_entry *last_entry, uint32_t freq, int shift, @@ -729,12 +746,12 @@ int dvb_new_entry_is_needed(struct dvb_entry *entry, return 1; } -struct dvb_entry *dvb_scan_add_entry(struct dvb_v5_fe_parms *__p, - struct dvb_entry *first_entry, - struct dvb_entry *entry, - uint32_t freq, uint32_t shift, - enum dvb_sat_polarization pol, - uint32_t stream_id) +struct dvb_entry *dvb_scan_add_entry_ex(struct dvb_v5_fe_parms *__p, + struct dvb_entry *first_entry, + struct dvb_entry *entry, + uint32_t freq, uint32_t shift, + enum dvb_sat_polarization pol, + uint32_t stream_id) { struct dvb_v5_fe_parms_priv *parms = (void *)__p; struct dvb_entry *new_entry; @@ -819,7 +836,7 @@ static void add_update_nit_dvbc(struct dvb_table_nit *nit, new = tr->entry; } else { new = dvb_scan_add_entry(tr->parms, tr->first_entry, tr->entry, - d->frequency, tr->shift, tr->pol, 0); + d->frequency, tr->shift, tr->pol); if (!new) return; } @@ -853,8 +870,7 @@ static void add_update_nit_isdbt(struct dvb_table_nit *nit, for (i = 0; i < d->num_freqs; i++) { new = dvb_scan_add_entry(tr->parms, tr->first_entry, tr->entry, - d->frequency[i], tr->shift, - tr->pol, 0); + d->frequency[i], tr->shift, tr->pol); if (!new) return; } @@ -928,9 +944,10 @@ static void add_update_nit_dvbt2(struct dvb_table_nit *nit, return; for (i = 0; i < t2->frequency_loop_length; i++) { - new = dvb_scan_add_entry(tr->parms, tr->first_entry, tr->entry, - t2->centre_frequency[i] * 10, - tr->shift, tr->pol, t2->plp_id); + new = dvb_scan_add_entry_ex(tr->parms, + tr->first_entry, tr->entry, + t2->centre_frequency[i] * 10, + tr->shift, tr->pol, t2->plp_id); if (!new) continue; @@ -960,8 +977,7 @@ static void add_update_nit_dvbt(struct dvb_table_nit *nit, return; new = dvb_scan_add_entry(tr->parms, tr->first_entry, tr->entry, - d->centre_frequency * 10, tr->shift, - tr->pol, 0); + d->centre_frequency * 10, tr->shift, tr->pol); if (!new) return; @@ -1000,7 +1016,7 @@ static void add_update_nit_dvbs(struct dvb_table_nit *nit, new = tr->entry; } else { new = dvb_scan_add_entry(tr->parms, tr->first_entry, tr->entry, - d->frequency, tr->shift, tr->pol, 0); + d->frequency, tr->shift, tr->pol); if (!new) return; } @@ -1042,8 +1058,8 @@ static void add_update_nit_isdbs(struct dvb_table_nit *nit, return; ts_id = tran->transport_id; - new = dvb_scan_add_entry(tr->parms, tr->first_entry, tr->entry, - d->frequency, tr->shift, tr->pol, ts_id); + new = dvb_scan_add_entry_ex(tr->parms, tr->first_entry, tr->entry, + d->frequency, tr->shift, tr->pol, ts_id); if (!new) return;