From owner-p4-projects@FreeBSD.ORG Tue Dec 23 04:10:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D8BD1065679; Tue, 23 Dec 2008 04:10:52 +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 1FF64106564A for ; Tue, 23 Dec 2008 04:10:52 +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 0ECBB8FC1A for ; Tue, 23 Dec 2008 04:10:52 +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 mBN4ApZf097602 for ; Tue, 23 Dec 2008 04:10:51 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBN4ApQl097600 for perforce@freebsd.org; Tue, 23 Dec 2008 04:10:51 GMT (envelope-from weongyo@FreeBSD.org) Date: Tue, 23 Dec 2008 04:10:51 GMT Message-Id: <200812230410.mBN4ApQl097600@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 155146 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: Tue, 23 Dec 2008 04:10:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=155146 Change 155146 by weongyo@weongyo_ws on 2008/12/23 04:10:13 style(9) Affected files ... .. //depot/projects/ndisusb/sys/dev/if_ndis/if_ndisvar.h#9 edit Differences ... ==== //depot/projects/ndisusb/sys/dev/if_ndis/if_ndisvar.h#9 (text+ko) ==== @@ -113,10 +113,10 @@ }; #define NDIS_VAP(vap) ((struct ndis_vap *)(vap)) -#define NDISUSB_CONFIG_NO 1 +#define NDISUSB_CONFIG_NO 1 #define NDISUSB_IFACE_INDEX 0 -#define NDISUSB_INTR_TIMEOUT 1000 -#define NDISUSB_TX_TIMEOUT 10000 +#define NDISUSB_INTR_TIMEOUT 1000 +#define NDISUSB_TX_TIMEOUT 10000 struct ndisusb_xfer { usbd_xfer_handle nx_xfer; usbd_private_handle nx_priv; @@ -204,27 +204,27 @@ io_workitem *ndisusb_xferitem; list_entry ndisusb_xferlist; kspin_lock ndisusb_xferlock; -#define NDISUSB_ENDPT_BOUT 0 -#define NDISUSB_ENDPT_BIN 1 -#define NDISUSB_ENDPT_IIN 2 -#define NDISUSB_ENDPT_IOUT 3 -#define NDISUSB_ENDPT_MAX 4 +#define NDISUSB_ENDPT_BOUT 0 +#define NDISUSB_ENDPT_BIN 1 +#define NDISUSB_ENDPT_IIN 2 +#define NDISUSB_ENDPT_IOUT 3 +#define NDISUSB_ENDPT_MAX 4 usbd_pipe_handle ndisusb_ep[NDISUSB_ENDPT_MAX]; char *ndisusb_iin_buf; int ndisusb_status; #define NDISUSB_STATUS_DETACH 0x1 }; -#define NDISMTX_LOCK(_sc) mtx_lock(&(_sc)->ndis_mtx) -#define NDISMTX_UNLOCK(_sc) mtx_unlock(&(_sc)->ndis_mtx) -#define NDISUSB_LOCK(_sc) mtx_lock(&Giant) -#define NDISUSB_UNLOCK(_sc) mtx_unlock(&Giant) -#define NDIS_LOCK(_sc) do { \ +#define NDISMTX_LOCK(_sc) mtx_lock(&(_sc)->ndis_mtx) +#define NDISMTX_UNLOCK(_sc) mtx_unlock(&(_sc)->ndis_mtx) +#define NDISUSB_LOCK(_sc) mtx_lock(&Giant) +#define NDISUSB_UNLOCK(_sc) mtx_unlock(&Giant) +#define NDIS_LOCK(_sc) do { \ if ((_sc)->ndis_iftype == PNPBus) \ NDISUSB_LOCK(_sc); \ NDISMTX_LOCK(_sc); \ } while (0) -#define NDIS_UNLOCK(_sc) do { \ +#define NDIS_UNLOCK(_sc) do { \ if ((_sc)->ndis_iftype == PNPBus) \ NDISUSB_UNLOCK(_sc); \ NDISMTX_UNLOCK(_sc); \