From patchwork Wed Oct 1 05:58:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Schwarzott X-Patchwork-Id: 5009711 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9FCD2BEEA6 for ; Wed, 1 Oct 2014 05:58:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CDCFC201FA for ; Wed, 1 Oct 2014 05:58:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8A686201F4 for ; Wed, 1 Oct 2014 05:58:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750861AbaJAF6Y (ORCPT ); Wed, 1 Oct 2014 01:58:24 -0400 Received: from smtp.gentoo.org ([140.211.166.183]:35863 "EHLO smtp.gentoo.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750716AbaJAF6Y (ORCPT ); Wed, 1 Oct 2014 01:58:24 -0400 Received: from gauss.fritz.box (aftr-88-217-180-138.dynamic.mnet-online.de [88.217.180.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: zzam) by smtp.gentoo.org (Postfix) with ESMTPSA id C90FE3401BB; Wed, 1 Oct 2014 05:58:22 +0000 (UTC) From: Matthias Schwarzott To: linux-media@vger.kernel.org, mchehab@osg.samsung.com, crope@iki.fi Cc: Matthias Schwarzott Subject: [PATCH V2 1/2] get_dvb_firmware: si2165: drop the extra header from the firmware Date: Wed, 1 Oct 2014 07:58:17 +0200 Message-Id: <1412143098-18293-1-git-send-email-zzam@gentoo.org> X-Mailer: git-send-email 2.1.1 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Store it with a different name based on hardware revision. V2: change firmware filename to lower case. Signed-off-by: Matthias Schwarzott --- Documentation/dvb/get_dvb_firmware | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/Documentation/dvb/get_dvb_firmware b/Documentation/dvb/get_dvb_firmware index 91b43d2..c3e758b 100755 --- a/Documentation/dvb/get_dvb_firmware +++ b/Documentation/dvb/get_dvb_firmware @@ -789,7 +789,8 @@ sub si2165 { my $sourcefile = "model_111xxx_122xxx_driver_6_0_119_31191_WHQL.zip"; my $url = "http://www.hauppauge.de/files/drivers/"; my $hash = "76633e7c76b0edee47c3ba18ded99336"; - my $fwfile = "dvb-demod-si2165.fw"; + my $fwfile = "dvb-demod-si2165-d.fw"; + my $fwhash = "1255c70a53fe562a89d5ff08d7461e2c"; my $tmpdir = tempdir(DIR => "/tmp", CLEANUP => 1); checkstandard(); @@ -797,21 +798,8 @@ sub si2165 { wgetfile($sourcefile, $url . $sourcefile); verify($sourcefile, $hash); unzip($sourcefile, $tmpdir); - extract("$tmpdir/Driver10/Hcw10bda.sys", 0x80788, 0x81E08-0x80788, "$tmpdir/fw1"); - - delzero("$tmpdir/fw1","$tmpdir/fw1-1"); - #verify("$tmpdir/fw1","5e0909858fdf0b5b09ad48b9fe622e70"); - - my $CRC="\x0A\xCC"; - my $BLOCKS_MAIN="\x27"; - open FW,">$fwfile"; - print FW "\x01\x00"; # just a version id for the driver itself - print FW "\x9A"; # fw version - print FW "\x00"; # padding - print FW "$BLOCKS_MAIN"; # number of blocks of main part - print FW "\x00"; # padding - print FW "$CRC"; # 16bit crc value of main part - appendfile(FW,"$tmpdir/fw1"); + extract("$tmpdir/Driver10/Hcw10bda.sys", 0x80788, 0x81E08-0x80788, "$fwfile"); + verify($fwfile, $fwhash); "$fwfile"; }