From owner-freebsd-current Tue Apr 7 10:44:35 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id KAA27967 for freebsd-current-outgoing; Tue, 7 Apr 1998 10:44:35 -0700 (PDT) (envelope-from owner-freebsd-current@FreeBSD.ORG) Received: from trinity.radio-do.de (trinity.Radio-do.de [193.101.164.3]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id KAA27905 for ; Tue, 7 Apr 1998 10:44:27 -0700 (PDT) (envelope-from fn@trinity.radio-do.de) Received: (from fn@localhost) by trinity.radio-do.de (8.8.8/8.8.5/RADIO-1.1) id TAA16050; Tue, 7 Apr 1998 19:44:15 +0200 (CEST) To: Eivind Eklund Cc: current@FreeBSD.ORG Subject: Re: LINT broken in brooktree848.c ? References: <9394.891847811@critter.freebsd.dk> <199804061735.TAA13185@trinity.radio-do.de> <19980407115512.57503@follo.net> From: Frank Nobis Date: 07 Apr 1998 19:44:15 +0200 In-Reply-To: Eivind Eklund's message of "Tue, 7 Apr 1998 11:55:12 +0200" Message-ID: Lines: 79 X-Mailer: Gnus v5.6.4/XEmacs 20.3 - "Vatican City" Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG >>>>> "Eivind" == Eivind Eklund writes: Eivind> On Mon, Apr 06, 1998 at 07:35:34PM +0200, Frank Nobis wrote: Eivind> This is a style-violation compared to the description at the start of Eivind> conf/options. Eivind> First of all, it's option definition should go in conf/options, not Eivind> i386/conf/options.i386, as the cards are not i386 specific. Eivind> Secondly, the #define should end up in opt_brooktree848.h (or in Eivind> opt_override_tuner.h if more files in brooktree848.c is in the loop Eivind> for using it). Eivind> Eivind. Your are absolutly right. I tried to do a good job and missed the right place to patch. So I hope this patch would do the job as desired Please don't judge too hard, because this is really the first time I did a patch which influenced more than one file. So again, here is the hopefully correct path. Please test it and commit it, if it's ok now. *** /usr/src/sys/conf/options.orig Tue Apr 7 19:23:33 1998 --- /usr/src/sys/conf/options Tue Apr 7 19:25:21 1998 *************** *** 227,229 **** --- 227,233 ---- # sys/netkey KEY KEY_DEBUG opt_key.h + + # sys/pci/brooktree848.c + # Look into the source for explanation of available values + OVERRIDE_TUNER opt_brooktree848.h *** /usr/src/sys/pci/brooktree848.c.orig Tue Apr 7 19:26:11 1998 --- /usr/src/sys/pci/brooktree848.c Tue Apr 7 19:26:45 1998 *************** *** 229,235 **** #ifdef __FreeBSD__ #include "bktr.h" ! #include "opt_bktr.h" #include "opt_devfs.h" #include "pci.h" #endif /* __FreeBSD__ */ --- 229,235 ---- #ifdef __FreeBSD__ #include "bktr.h" ! #include "opt_brooktree848.h" #include "opt_devfs.h" #include "pci.h" #endif /* __FreeBSD__ */ *** /usr/src/sys/i386/conf/LINT.orig Mon Apr 6 19:29:43 1998 --- /usr/src/sys/i386/conf/LINT Tue Apr 7 19:37:17 1998 *************** *** 1330,1335 **** --- 1330,1339 ---- # # The 'bktr' device is a PCI video capture board. It also has a TV tuner # on board. + # Sometimes it is necessary to override the tuner detection. + # Use the next option for this purpose. + # options OVERRIDE_TUNER=x + # The current values are found in /usr/src/sys/pci/brooktree848.c # controller pci0 controller ahc1 Frank -- Frank Nobis Email: PGP AVAILABLE Landgrafenstr. 130 dg3dcn http://www.radio-do.de/~fn/ 44139 Dortmund Powered by FreeBSD To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message