PERFORCE change 74299 for review

[John Baldwin]

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

Change 74299 by jhb at jhb_slimer on 2005/04/01 18:52:31

	IFC @74297.

Affected files ...

.. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#25 integrate
.. //depot/projects/smpng/sys/dev/pci/pci.c#55 integrate
.. //depot/projects/smpng/sys/modules/Makefile#94 integrate

Differences ...

==== //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#25 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.75 2005/03/30 02:50:06 wpaul Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.76 2005/04/01 16:40:22 wpaul Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -93,6 +93,7 @@
 	IMPORT_FUNC(ndis_getdone_func),
 	IMPORT_FUNC(ndis_resetdone_func),
 	IMPORT_FUNC(ndis_sendrsrcavail_func),
+	IMPORT_FUNC(ndis_intrhand),
 
 	{ NULL, NULL, NULL }
 };
@@ -1718,7 +1719,7 @@
 	sc->ndis_block = block;
 	sc->ndis_chars = IoGetDriverObjectExtension(drv, (void *)1);
 
-	IoInitializeDpcRequest(fdo, ndis_intrhand);
+	IoInitializeDpcRequest(fdo, kernndis_functbl[6].ipt_wrap);
 
 	/* Finish up BSD-specific setup. */
 

==== //depot/projects/smpng/sys/dev/pci/pci.c#55 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.284 2005/03/26 20:31:09 jmg Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.285 2005/04/01 16:22:50 jmg Exp $");
 
 #include "opt_bus.h"
 
@@ -509,11 +509,6 @@
 	if (oldstate == state)
 		return (0);
 
-	if (bootverbose)
-		printf(
-		    "pci%d:%d:%d: Transition from D%d to D%d\n",
-		    dinfo->cfg.bus, dinfo->cfg.slot, dinfo->cfg.func,
-		    oldstate, state);
 	/*
 	 * The PCI power management specification states that after a state
 	 * transition between PCI power states, system software must
@@ -556,6 +551,13 @@
 	default:
 		return (EINVAL);
 	}
+
+	if (bootverbose)
+		printf(
+		    "pci%d:%d:%d: Transition from D%d to D%d\n",
+		    dinfo->cfg.bus, dinfo->cfg.slot, dinfo->cfg.func,
+		    oldstate, state);
+
 	PCI_WRITE_CONFIG(dev, child, cfg->pp.pp_status, status, 2);
 	if (delay)
 		DELAY(delay);

==== //depot/projects/smpng/sys/modules/Makefile#94 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/modules/Makefile,v 1.436 2005/03/31 20:21:43 scottl Exp $
+# $FreeBSD: src/sys/modules/Makefile,v 1.437 2005/04/01 17:40:39 imp Exp $
 
 # oldcard -- specialized use for debugging only.
 # owi -- totally unsupported for debugging only.
@@ -307,7 +307,6 @@
 _aout=		aout
 _apm=		apm
 _ar=		ar
-_arcmsr=	arcmsr
 _arcnet=	arcnet
 _ath_hal=	ath_hal
 _awi=		awi
@@ -361,6 +360,7 @@
 _acpi=		acpi
 _ahb=		ahb
 _arl=		arl
+_arcmsr=	arcmsr
 _asr=		asr
 _bios=		bios
 _cardbus=	cardbus