PERFORCE change 90763 for review

[Kip Macy]

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

Change 90763 by kmacy at kmacy:freebsd7_xen3 on 2006/01/31 04:53:45

	re-enable support for isa
	add back in missed default devices

Affected files ...

.. //depot/projects/xen3/src/sys/conf/files.i386-xen#4 edit
.. //depot/projects/xen3/src/sys/i386-xen/conf/XENCONF#4 edit
.. //depot/projects/xen3/src/sys/i386-xen/i386-xen/exception.s#2 edit
.. //depot/projects/xen3/src/sys/i386-xen/i386-xen/machdep.c#7 edit
.. //depot/projects/xen3/src/sys/i386/isa/atpic.c#2 edit

Differences ...

==== //depot/projects/xen3/src/sys/conf/files.i386-xen#4 (text+ko) ====

@@ -303,7 +303,7 @@
 i386/ibcs2/ibcs2_xenix.c	optional ibcs2
 i386/ibcs2/ibcs2_xenix_sysent.c	optional ibcs2
 i386/ibcs2/imgact_coff.c	optional ibcs2
-#i386/isa/atpic.c		standard
+i386/isa/atpic.c		standard
 #i386/isa/atpic_vector.s		standard
 i386/isa/elcr.c			standard
 i386/isa/elink.c		optional ep | ie

==== //depot/projects/xen3/src/sys/i386-xen/conf/XENCONF#4 (text+ko) ====

@@ -96,9 +96,21 @@
 
 #device		agp		# support several AGP chipsets
 
+
+
+#defaults
 # Floating point support - do not disable. 
 device		npx
 
+device		isa
+
+device		mem
+device		io
+
+#######################################
+
+
+
 # Serial (COM) ports
 #device		sio		# 8250, 16[45]50 based serial ports
 

==== //depot/projects/xen3/src/sys/i386-xen/i386-xen/exception.s#2 (text+ko) ====

@@ -264,9 +264,9 @@
 	.text
 	SUPERALIGN_TEXT
 MCOUNT_LABEL(bintr)
-#ifndef XEN
+
 #include <i386/isa/atpic_vector.s>
-#endif
+
 #ifdef DEV_APIC
 	.data
 	.p2align 4

==== //depot/projects/xen3/src/sys/i386-xen/i386-xen/machdep.c#7 (text+ko) ====

@@ -2387,8 +2387,10 @@
 		printf("WARNING: loader(8) metadata is missing!\n");
 
 #ifdef DEV_ISA
-	elcr_probe();
-	atpic_startup();
+	if (xen_start_info->flags & SIF_PRIVILEGED) {
+		elcr_probe();
+		atpic_startup();
+	}
 #endif
 
 #ifdef DDB

==== //depot/projects/xen3/src/sys/i386/isa/atpic.c#2 (text+ko) ====

@@ -112,6 +112,7 @@
 static void	atpic_init(void *dummy);
 
 unsigned int imen;	/* XXX */
+extern int running_xen;
 
 inthand_t
 	IDTVEC(atpic_intr0), IDTVEC(atpic_intr1), IDTVEC(atpic_intr2),
@@ -516,6 +517,9 @@
 	struct atpic_intsrc *ai;
 	int i;
 
+	if (running_xen)
+		return;
+
 	/*
 	 * If any of the ISA IRQs have an interrupt source already, then
 	 * assume that the APICs are being used and don't register any