From owner-p4-projects@FreeBSD.ORG Fri Apr 1 18:52:48 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2FB9E16A504; Fri, 1 Apr 2005 18:52:48 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DF95016A4EE for ; Fri, 1 Apr 2005 18:52:47 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 27BC543D39 for ; Fri, 1 Apr 2005 18:52:47 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j31IqldP073078 for ; Fri, 1 Apr 2005 18:52:47 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j31IqkEd073075 for perforce@freebsd.org; Fri, 1 Apr 2005 18:52:46 GMT (envelope-from jhb@freebsd.org) Date: Fri, 1 Apr 2005 18:52:46 GMT Message-Id: <200504011852.j31IqkEd073075@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 74299 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Apr 2005 18:52:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=74299 Change 74299 by jhb@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 -__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 #include @@ -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 -__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