From owner-p4-projects@FreeBSD.ORG Mon Dec 22 12:27:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A13B1065675; Mon, 22 Dec 2008 12:27:51 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F29481065673 for ; Mon, 22 Dec 2008 12:27:50 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E16E18FC2A for ; Mon, 22 Dec 2008 12:27:50 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBMCRouM052144 for ; Mon, 22 Dec 2008 12:27:50 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBMCRoQZ052142 for perforce@freebsd.org; Mon, 22 Dec 2008 12:27:50 GMT (envelope-from weongyo@FreeBSD.org) Date: Mon, 22 Dec 2008 12:27:50 GMT Message-Id: <200812221227.mBMCRoQZ052142@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 155116 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Dec 2008 12:27:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=155116 Change 155116 by weongyo@weongyo_ws on 2008/12/22 12:27:13 implement ndis_pnpevent_nic() function to support MiniportPnpEventNotify() method. Currently it'd be used at USB detaching by NDIS_PNP_EVENT_SURPRISE_REMOVED. While I'm here add a missed prototype. Affected files ... .. //depot/projects/ndisusb/sys/compat/ndis/kern_ndis.c#8 edit .. //depot/projects/ndisusb/sys/compat/ndis/ndis_var.h#3 edit Differences ... ==== //depot/projects/ndisusb/sys/compat/ndis/kern_ndis.c#8 (text+ko) ==== @@ -1225,6 +1225,31 @@ } int +ndis_pnpevent_nic(arg, type) + void *arg; + int type; +{ + struct ndis_softc *sc; + ndis_handle adapter; + ndis_pnpevent_handler pnpeventfunc; + + sc = arg; + NDIS_LOCK(sc); + adapter = sc->ndis_block->nmb_miniportadapterctx; + pnpeventfunc = sc->ndis_chars->nmc_pnpevent_handler; + NDIS_UNLOCK(sc); + if (adapter == NULL || pnpeventfunc == NULL) + return(EIO); + + if (sc->ndis_chars->nmc_rsvd0 == NULL) + MSCALL4(pnpeventfunc, adapter, type, NULL, 0); + else + MSCALL4(pnpeventfunc, sc->ndis_chars->nmc_rsvd0, type, NULL, 0); + + return (0); +} + +int ndis_init_nic(arg) void *arg; { ==== //depot/projects/ndisusb/sys/compat/ndis/ndis_var.h#3 (text+ko) ==== @@ -1658,6 +1658,7 @@ typedef void (*ndis_enable_interrupts_handler)(ndis_handle); typedef void (*ndis_disable_interrupts_handler)(ndis_handle); typedef void (*ndis_shutdown_handler)(void *); +typedef void (*ndis_pnpevent_handler)(void *, int, void *, uint32_t); typedef void (*ndis_allocdone_handler)(ndis_handle, void *, ndis_physaddr *, uint32_t, void *); typedef uint8_t (*ndis_checkforhang_handler)(ndis_handle); @@ -1739,6 +1740,7 @@ extern int ndis_reset_nic(void *); extern int ndis_halt_nic(void *); extern int ndis_shutdown_nic(void *); +extern int ndis_pnpevent_nic(void *, int); extern int ndis_init_nic(void *); extern void ndis_return_packet(void *, void *); extern int ndis_init_dma(void *); @@ -1759,6 +1761,7 @@ extern void NdisFreePacket(ndis_packet *); extern ndis_status NdisScheduleWorkItem(ndis_work_item *); extern void NdisMSleep(uint32_t); +extern void ndis_cancel_timerlist(void); __END_DECLS #endif /* _NDIS_VAR_H_ */