From patchwork Sun Apr 13 19:18:34 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Reinhard Nissl X-Patchwork-Id: 12649 Received: from mail.gmx.net ([213.165.64.20]) by www.linuxtv.org with smtp (Exim 4.63) (envelope-from ) id 1Jl7jL-0005Af-E6 for vdr@linuxtv.org; Sun, 13 Apr 2008 21:19:12 +0200 Received: (qmail invoked by alias); 13 Apr 2008 19:18:38 -0000 Received: from p549304E0.dip0.t-ipconnect.de (EHLO [192.168.101.15]) [84.147.4.224] by mail.gmx.net (mp034) with SMTP; 13 Apr 2008 21:18:38 +0200 X-Authenticated: #527675 X-Provags-ID: V01U2FsdGVkX1/9dYlQReD9fbAdaGYK+haQhosAzkUDnUZnt5m8PP hxTLI5UJtO14yO Message-ID: <48025C8A.20003@gmx.de> Date: Sun, 13 Apr 2008 21:18:34 +0200 From: Reinhard Nissl User-Agent: Mozilla/5.0 (X11; U; Linux i686; de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: VDR Mailing List References: <4802308C.2020704@helmutauer.de> <4802330B.6020808@helmutauer.de> In-Reply-To: <4802330B.6020808@helmutauer.de> X-Y-GMX-Trusted: 0 X-LSpam-Score: -2.3 (--) X-LSpam-Report: No, score=-2.3 required=5.0 tests=AWL=0.278, BAYES_00=-2.599 autolearn=ham Subject: Re: [vdr] vdr 1.7.0 does not compile X-BeenThere: vdr@linuxtv.org X-Mailman-Version: 2.1.9 Precedence: list Reply-To: VDR Mailing List List-Id: VDR Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Apr 2008 19:19:13 -0000 Status: O X-Status: X-Keywords: X-UID: 16492 Hi, Helmut Auer schrieb: >> dvbdevice.c >> dvbdevice.c: In member function 'bool cDvbTuner::SetFrontend()': >> dvbdevice.c:271: error: 'struct dvbfe_info' has no member named 'delivery' >> dvbdevice.c:286: error: 'struct dvbfe_info' has no member named 'delivery' >> dvbdevice.c:307: error: 'struct dvbfe_info' has no member named 'delivery' >> make: *** [dvbdevice.o] Error 1 >> >> The driver I am using ist http://jusst.de/hg/multiproto svn from today, >> and the included frontend.h really has no delivery member in this structure. > > delivery was removed 5 weeks ago: > http://jusst.de/hg/multiproto/log/46df93f7bcee/linux/include/linux/dvb/frontend.h The attached patch should make it build. Bye. diff -Nurp ../vdr-1.7.0-orig/dvbdevice.c ./dvbdevice.c --- ../vdr-1.7.0-orig/dvbdevice.c 2008-04-13 16:15:35.000000000 +0200 +++ ./dvbdevice.c 2008-04-13 21:16:45.000000000 +0200 @@ -266,10 +266,6 @@ bool cDvbTuner::SetFrontend(void) tuneTimeout = DVBS_TUNE_TIMEOUT; lockTimeout = DVBS_LOCK_TIMEOUT; - - dvbfe_info feinfo; - feinfo.delivery = Frontend.delivery; - CHECK(ioctl(fd_frontend, DVBFE_GET_INFO, &feinfo)); //switch system } else if (frontendType & DVBFE_DELSYS_DVBC) { Frontend.delivery = DVBFE_DELSYS_DVBC; @@ -281,10 +277,6 @@ bool cDvbTuner::SetFrontend(void) tuneTimeout = DVBC_TUNE_TIMEOUT; lockTimeout = DVBC_LOCK_TIMEOUT; - - dvbfe_info feinfo; - feinfo.delivery = Frontend.delivery; - CHECK(ioctl(fd_frontend, DVBFE_GET_INFO, &feinfo)); //switch system } else if (frontendType & DVBFE_DELSYS_DVBT) { Frontend.delivery = DVBFE_DELSYS_DVBT; @@ -302,15 +294,12 @@ bool cDvbTuner::SetFrontend(void) tuneTimeout = DVBT_TUNE_TIMEOUT; lockTimeout = DVBT_LOCK_TIMEOUT; - - dvbfe_info feinfo; - feinfo.delivery = Frontend.delivery; - CHECK(ioctl(fd_frontend, DVBFE_GET_INFO, &feinfo)); //switch system } else { esyslog("ERROR: attempt to set channel with unknown DVB frontend type"); return false; } + CHECK(ioctl(fd_frontend, DVBFE_SET_DELSYS, &Frontend.delivery)); //switch system if (ioctl(fd_frontend, DVBFE_SET_PARAMS, &Frontend) < 0) { esyslog("ERROR: frontend %d: %m", cardIndex); return false;