From owner-freebsd-current@FreeBSD.ORG Mon Nov 3 01:02:40 2003 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 20E0316A4CF for ; Mon, 3 Nov 2003 01:02:40 -0800 (PST) Received: from mail.broadpark.no (mail.broadpark.no [217.13.4.2]) by mx1.FreeBSD.org (Postfix) with ESMTP id 231AC43FBF for ; Mon, 3 Nov 2003 01:02:39 -0800 (PST) (envelope-from des@des.no) Received: from smtp.des.no (37.80-203-228.nextgentel.com [80.203.228.37]) by mail.broadpark.no (Postfix) with ESMTP id AA17379575; Mon, 3 Nov 2003 10:02:37 +0100 (MET) Received: by smtp.des.no (Pony Express, from userid 666) id 554F39C8D5; Mon, 3 Nov 2003 10:02:37 +0100 (CET) Received: from dwp.des.no (dwp.des.no [10.0.0.4]) by smtp.des.no (Pony Express) with ESMTP id 4E64C9B9C7; Mon, 3 Nov 2003 10:02:33 +0100 (CET) Received: by dwp.des.no (Postfix, from userid 2602) id 41531B823; Mon, 3 Nov 2003 10:02:33 +0100 (CET) To: Soren Schmidt References: <200311030810.hA38A2cq062907@spider.deepcore.dk> From: des@des.no (Dag-Erling =?iso-8859-1?q?Sm=F8rgrav?=) Date: Mon, 03 Nov 2003 10:02:33 +0100 In-Reply-To: <200311030810.hA38A2cq062907@spider.deepcore.dk> (Soren Schmidt's message of "Mon, 3 Nov 2003 09:10:02 +0100 (CET)") Message-ID: User-Agent: Gnus/5.090024 (Oort Gnus v0.24) Emacs/21.3 (berkeley-unix) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Checker-Version: SpamAssassin 2.60 (1.212-2003-09-23-exp) on dsa.des.no X-Spam-Level: X-Spam-Status: No, hits=0.0 required=5.0 tests=none autolearn=no version=2.60 cc: current@FreeBSD.ORG cc: Kent Stewart cc: Harald Schmalzbauer Subject: Re: hw.ata.atapi_dma vanished X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Nov 2003 09:02:40 -0000 --=-=-= Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable Soren Schmidt writes: > It diapeared some time ago, but setting it in loader.conf still works > you just cannot see it. Its on my TODO list, but real bugs has priority > over this minor nit... Then you won't mind if I commit the attached patch? DES --=20 Dag-Erling Sm=F8rgrav - des@des.no --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=ata.diff Index: ata-all.c =================================================================== RCS file: /home/ncvs/src/sys/dev/ata/ata-all.c,v retrieving revision 1.195 diff -u -r1.195 ata-all.c --- ata-all.c 12 Oct 2003 12:37:11 -0000 1.195 +++ ata-all.c 3 Nov 2003 09:01:30 -0000 @@ -76,8 +76,14 @@ /* sysctl vars */ SYSCTL_NODE(_hw, OID_AUTO, ata, CTLFLAG_RD, 0, "ATA driver parameters"); TUNABLE_INT("hw.ata.ata_dma", &ata_dma); +SYSCTL_INT(_hw_ata, OID_AUTO, ata_dma, CTLFLAG_RDTUN, &ata_dma, 0, + "ATA disk DMA mode control"); TUNABLE_INT("hw.ata.wc", &ata_wc); +SYSCTL_INT(_hw_ata, OID_AUTO, wc, CTLFLAG_RDTUN, &ata_wc, 0, + "ATA disk write caching"); TUNABLE_INT("hw.ata.atapi_dma", &atapi_dma); +SYSCTL_INT(_hw_ata, OID_AUTO, atapi_dma, CTLFLAG_RDTUN, &atapi_dma, 0, + "ATAPI device DMA mode control"); int ata_dma = 1; int ata_wc = 1; int atapi_dma = 0; Index: ata-disk.c =================================================================== RCS file: /home/ncvs/src/sys/dev/ata/ata-disk.c,v retrieving revision 1.161 diff -u -r1.161 ata-disk.c --- ata-disk.c 21 Oct 2003 18:28:34 -0000 1.161 +++ ata-disk.c 3 Nov 2003 09:01:09 -0000 @@ -67,13 +67,6 @@ static MALLOC_DEFINE(M_AD, "AD driver", "ATA disk driver"); static u_int32_t adp_lun_map = 0; -/* sysctl vars */ -SYSCTL_DECL(_hw_ata); -SYSCTL_INT(_hw_ata, OID_AUTO, ata_dma, CTLFLAG_RDTUN, &ata_dma, 0, - "ATA disk DMA mode control"); -SYSCTL_INT(_hw_ata, OID_AUTO, wc, CTLFLAG_RDTUN, &ata_wc, 0, - "ATA disk write caching"); - void ad_attach(struct ata_device *atadev) { --=-=-=--