PERFORCE change 42084 for review

[Peter Wemm]

http://perforce.freebsd.org/chv.cgi?CH=42084

Change 42084 by peter at peter_overcee on 2003/11/11 19:31:26

	create an atpic device which is optional.

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/machdep.c#64 edit
.. //depot/projects/hammer/sys/conf/files.amd64#34 edit
.. //depot/projects/hammer/sys/conf/options.amd64#14 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#64 (text+ko) ====

@@ -42,12 +42,12 @@
 __FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.597 2003/11/09 20:31:02 marcel Exp $");
 
 #include "opt_atalk.h"
+#include "opt_atpic.h"
 #include "opt_compat.h"
 #include "opt_cpu.h"
 #include "opt_ddb.h"
 #include "opt_inet.h"
 #include "opt_ipx.h"
-#include "opt_isa.h"
 #include "opt_kstack_pages.h"
 #include "opt_maxmem.h"
 #include "opt_msgbuf.h"
@@ -1226,7 +1226,7 @@
 	 */
 	cninit();
 
-#ifdef DEV_ISA
+#ifdef DEV_ATPIC
 	atpic_startup();
 #endif
 

==== //depot/projects/hammer/sys/conf/files.amd64#34 (text+ko) ====

@@ -62,8 +62,8 @@
 amd64/amd64/tsc.c		standard
 amd64/amd64/uma_machdep.c	standard
 amd64/amd64/vm_machdep.c	standard
-amd64/isa/atpic.c		standard
-amd64/isa/atpic_vector.S	standard
+amd64/isa/atpic.c		optional	atpic isa
+amd64/isa/atpic_vector.S	optional	atpic isa
 amd64/isa/clock.c		standard
 amd64/isa/isa.c			standard
 amd64/isa/isa_dma.c		standard

==== //depot/projects/hammer/sys/conf/options.amd64#14 (text+ko) ====

@@ -30,3 +30,4 @@
 PSM_DEBUG		opt_psm.h
 IA32
 NO_MIXED_MODE
+DEV_ATPIC		opt_atpic.h