From owner-freebsd-doc Sun Feb 3 2:20:41 2002 Delivered-To: freebsd-doc@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id CE19737B405 for ; Sun, 3 Feb 2002 02:20:00 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g13AK0D77701; Sun, 3 Feb 2002 02:20:00 -0800 (PST) (envelope-from gnats) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9D78037B404 for ; Sun, 3 Feb 2002 02:10:47 -0800 (PST) Received: (from nobody@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g13AAlS76607; Sun, 3 Feb 2002 02:10:47 -0800 (PST) (envelope-from nobody) Message-Id: <200202031010.g13AAlS76607@freefall.freebsd.org> Date: Sun, 3 Feb 2002 02:10:47 -0800 (PST) From: Yonatan Bokovza To: freebsd-gnats-submit@freebsd.org X-Send-Pr-Version: www-1.0 Subject: docs/34577: Some man pages still advise using "conflicts" [patch] Sender: owner-freebsd-doc@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 34577 >Category: docs >Synopsis: Some man pages still advise using "conflicts" [patch] >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-doc >State: open >Quarter: >Keywords: >Date-Required: >Class: doc-bug >Submitter-Id: current-users >Arrival-Date: Sun Feb 03 02:20:00 PST 2002 >Closed-Date: >Last-Modified: >Originator: Yonatan Bokovza >Release: 4.5-Stable >Organization: >Environment: FreeBSD Temujin 4.5-STABLE FreeBSD 4.5-STABLE #14: Fri Feb 1 11:38:41 IST 2002 root@Temujin:/usr/obj/usr/src/sys/TEMUJIN i386 >Description: According to "config" the keyword "conflicts" is obsolete: config: line 123: Obsolete keyword 'conflicts' found *** Error code 1 Let's undocument it, from sb(4), sc(4), syscons(4), and vga(4) >How-To-Repeat: Enter this example to your kernel configuration file: device vga0 at isa? conflicts and run "config" on it. >Fix: --- sb.4.orig Fri Feb 1 11:58:38 2002 +++ sb.4 Fri Feb 1 12:01:16 2002 @@ -50,15 +50,11 @@ SoundBlaster 1.0 to the SoundBlaster 16/SoundBlaster 32. The awe driver provides AWE32/64 functionality. This driver is provided in .Fx -versions 2.0-current through 3.0-current. You can also configure more -then one card on a single DMA using the conflicts keyword in your -configuration file. This is useful for boards with more then one type of -emulation. +versions 2.0-current through 3.0-current. .Sh BUGS Since the SB16 uses the same IRQ and addresses for the different drivers, some of the snd drivers will not be probed because -the kernel thinks there is a conflict. This can be worked-around by -using the "conflicts" keyword on the sb16's device line. +the kernel thinks there is a conflict. .Pp Current version doesn't support mode changes without closing and reopening the device. --- sc.4.orig Fri Feb 1 11:58:46 2002 +++ sc.4 Fri Feb 1 12:12:06 2002 @@ -429,7 +429,7 @@ .Bd -literal -offset indent device atkbdc0 at isa? port IO_KBD device atkbd0 at atkbdc? irq 1 -device vga0 at isa? conflicts +device vga0 at isa? device sc0 at isa? pseudo-device splash --- syscons.4.orig Fri Feb 1 11:58:52 2002 +++ syscons.4 Fri Feb 1 12:12:55 2002 @@ -429,7 +429,7 @@ .Bd -literal -offset indent device atkbdc0 at isa? port IO_KBD device atkbd0 at atkbdc? irq 1 -device vga0 at isa? conflicts +device vga0 at isa? device sc0 at isa? pseudo-device splash --- vga.4.orig Fri Feb 1 11:58:59 2002 +++ vga.4 Fri Feb 1 12:15:08 2002 @@ -40,7 +40,7 @@ .Cd "options VGA_NO_MODE_CHANGE" .Cd "options VGA_SLOW_IOACCESS" .Cd "options VGA_WIDTH90" -.Cd "device vga0 at isa? port ? conflicts" +.Cd "device vga0 at isa? port ?" .Sh DESCRIPTION The .Nm @@ -51,11 +51,6 @@ .Nm driver to manipulate video hardware (changing video modes, loading font, etc). .Pp -The keyword -.Dv conflicts -is required, as the video card may use I/O ports in the same range -as other drivers. -.Pp The .Nm driver supports the standard video cards: MDA, CGA, EGA and VGA. @@ -131,13 +126,13 @@ .Sh EXAMPLES Your kernel configuration should normally have: .Pp -.Dl "device vga0 at isa? port ? conflicts" +.Dl "device vga0 at isa? port ?" .Pp The following lines should be included in the kernel configuration file in order to enable the VESA BIOS Extension support. .Pp .Dl "options VESA" -.Dl "device vga0 at isa? port ? conflicts" +.Dl "device vga0 at isa? port ?" .Pp If you do not want VESA support included in the kernel, but want to use occasionally, do not add the >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-doc" in the body of the message