From root@eisa-test.jurai.net Wed May 12 16:22:49 1999
Return-Path: <root@eisa-test.jurai.net>
Received: from eisa-test.jurai.net (private-net-gateway.halo.net [63.67.141.66])
	by hub.freebsd.org (Postfix) with ESMTP id CB94B15A2D
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 12 May 1999 16:22:42 -0700 (PDT)
	(envelope-from root@eisa-test.jurai.net)
Received: (from root@localhost)
	by eisa-test.jurai.net (8.9.3/8.9.1) id TAA79332;
	Wed, 12 May 1999 19:22:41 -0400 (EDT)
	(envelope-from root)
Message-Id: <199905122322.TAA79332@eisa-test.jurai.net>
Date: Wed, 12 May 1999 19:22:41 -0400 (EDT)
From: "Matthew N. Dodd" <winter@juraI.net>
Sender: root@eisa-test.jurai.net
Reply-To: "Matthew N. Dodd" <winter@juraI.net>
To: FreeBSD-gnats-submit@freebsd.org
Subject: PCI-less kernel will not compile with ATAPI support.  
X-Send-Pr-Version: 3.2

>Number:         11676
>Category:       kern
>Synopsis:       PCIless kernel will not compile with ATAPI support.
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    sos
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed May 12 16:30:01 PDT 1999
>Closed-Date:    Mon Apr 2 12:39:27 PDT 2001
>Last-Modified:  Mon Apr 02 12:40:06 PDT 2001
>Originator:     "Matthew N. Dodd" <winter@jurai.net>
>Release:        FreeBSD 4.0-CURRENT i386
>Organization:
>Environment:
System without any PCI hardware.
ATAPI support compiled in.

	

>Description:
It is not possible to compile in ATAPI drivers without compiling in PCI
support as well.  In some cases this is not desired.

	

>How-To-Repeat:
Attempt to compile a system with ATAPI drivers but no 'controller pci0'.

	

>Fix:
	
	

Index: sys/dev/ata/ata-all.c
===================================================================
RCS file: /cvs/src/sys/dev/ata/ata-all.c,v
retrieving revision 1.12
diff -u -r1.12 ata-all.c
--- ata-all.c	1999/05/08 21:58:58	1.12
+++ ata-all.c	1999/05/09 16:38:29
@@ -54,8 +54,10 @@
 #include <machine/smp.h>
 #include <i386/isa/intr_machdep.h>
 #endif
+#if NPCI > 0
 #include <pci/pcivar.h>
 #include <pci/pcireg.h>
+#endif
 #include <isa/isavar.h>
 #include <isa/isareg.h>
 #include <dev/ata/ata-all.h>
Index: sys/dev/ata/ata-disk.c
===================================================================
RCS file: /cvs/src/sys/dev/ata/ata-disk.c,v
retrieving revision 1.10
diff -u -r1.10 ata-disk.c
--- ata-disk.c	1999/05/11 19:53:58	1.10
+++ ata-disk.c	1999/05/11 22:17:17
@@ -51,7 +51,9 @@
 #include <sys/devfsext.h>
 #endif
 #include <machine/clock.h>
+#if NPCI > 0
 #include <pci/pcivar.h>
+#endif
 #include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
 #include <dev/ata/ata-all.h>
Index: sys/dev/ata/ata-dma.c
===================================================================
RCS file: /cvs/src/sys/dev/ata/ata-dma.c,v
retrieving revision 1.6
diff -u -r1.6 ata-dma.c
--- ata-dma.c	1999/04/18 20:48:15	1.6
+++ ata-dma.c	1999/04/18 23:11:49
@@ -39,8 +39,10 @@
 #include <sys/bus.h>
 #include <vm/vm.h>           
 #include <vm/pmap.h>
+#if NPCI > 0
 #include <pci/pcivar.h>
 #include <pci/pcireg.h>
+#endif
 #include <dev/ata/ata-all.h>
 
 #ifdef __alpha__
Index: sys/dev/ata/atapi-all.c
===================================================================
RCS file: /cvs/src/sys/dev/ata/atapi-all.c,v
retrieving revision 1.7
diff -u -r1.7 atapi-all.c
--- atapi-all.c	1999/04/16 21:21:53	1.7
+++ atapi-all.c	1999/04/18 23:11:59
@@ -44,7 +44,9 @@
 #include <sys/malloc.h>
 #include <sys/devicestat.h>
 #include <machine/clock.h>
+#if NPCI > 0
 #include <pci/pcivar.h>
+#endif
 #include <dev/ata/ata-all.h>
 #include <dev/ata/atapi-all.h>
 
Index: sys/dev/ata/atapi-cd.c
===================================================================
RCS file: /cvs/src/sys/dev/ata/atapi-cd.c,v
retrieving revision 1.7
diff -u -r1.7 atapi-cd.c
--- atapi-cd.c	1999/05/07 07:03:13	1.7
+++ atapi-cd.c	1999/05/07 15:10:20
@@ -50,7 +50,9 @@
 #ifdef DEVFS
 #include <sys/devfsext.h>
 #endif
+#if NPCI > 0
 #include <pci/pcivar.h>
+#endif
 #include <dev/ata/ata-all.h>
 #include <dev/ata/atapi-all.h>
 #include <dev/ata/atapi-cd.h>
Index: sys/dev/ata/atapi-fd.c
===================================================================
RCS file: /cvs/src/sys/dev/ata/atapi-fd.c,v
retrieving revision 1.6
diff -u -r1.6 atapi-fd.c
--- atapi-fd.c	1999/05/07 07:03:14	1.6
+++ atapi-fd.c	1999/05/07 15:10:20
@@ -51,7 +51,9 @@
 #ifdef DEVFS
 #include <sys/devfsext.h>
 #endif
+#if NPCI > 0
 #include <pci/pcivar.h>
+#endif
 #include <dev/ata/ata-all.h>
 #include <dev/ata/atapi-all.h>
 #include <dev/ata/atapi-fd.h>
Index: sys/dev/ata/atapi-tape.c
===================================================================
RCS file: /cvs/src/sys/dev/ata/atapi-tape.c,v
retrieving revision 1.7
diff -u -r1.7 atapi-tape.c
--- atapi-tape.c	1999/05/07 07:03:15	1.7
+++ atapi-tape.c	1999/05/07 15:10:21
@@ -47,7 +47,9 @@
 #include <sys/devfsext.h>
 #endif
 #include <machine/clock.h>
+#if NPCI > 0 
 #include <pci/pcivar.h>
+#endif
 #include <dev/ata/ata-all.h>
 #include <dev/ata/atapi-all.h>
 #include <dev/ata/atapi-tape.h>

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: gnats-admin->freebsd-bugs 
Responsible-Changed-By: steve 
Responsible-Changed-When: Sun May 16 17:12:15 PDT 1999 
Responsible-Changed-Why:  
Misfiled PR. 
Responsible-Changed-From-To: freebsd-bugs->sos 
Responsible-Changed-By: phk 
Responsible-Changed-When: Tue Feb 20 11:28:58 PST 2001 
Responsible-Changed-Why:  
This is a sos@ thing, but I supposed he can just close this PR 
considering the age of the thing. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=11676 
State-Changed-From-To: open->closed 
State-Changed-By: sos 
State-Changed-When: Mon Apr 2 12:39:27 PDT 2001 
State-Changed-Why:  
THis has be resolved long ago. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=11676 
>Unformatted:
