From owner-p4-projects@FreeBSD.ORG Thu Aug 5 15:46:36 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 39D78106567B; Thu, 5 Aug 2010 15:46:36 +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 F296A1065676 for ; Thu, 5 Aug 2010 15:46:35 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C5FA38FC1C for ; Thu, 5 Aug 2010 15:46:35 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o75FkZWg005974 for ; Thu, 5 Aug 2010 15:46:35 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o75FkZxY005972 for perforce@freebsd.org; Thu, 5 Aug 2010 15:46:35 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 5 Aug 2010 15:46:35 GMT Message-Id: <201008051546.o75FkZxY005972@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 181867 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Aug 2010 15:46:36 -0000 http://p4web.freebsd.org/@@181867?ac=10 Change 181867 by hselasky@hselasky_laptop001 on 2010/08/05 15:46:12 USB controller (XHCI): - correct some register definitions. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/xhcireg.h#14 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/xhcireg.h#14 (text+ko) ==== @@ -117,7 +117,7 @@ #define XHCI_PS_PLS_GET(x) (((x) >> 5) & 0xF) /* RW - port link state */ #define XHCI_PS_PLS_SET(x) (((x) & 0xF) << 5) /* RW - port link state */ #define XHCI_PS_PP 0x00000100 /* RW - port power */ -#define XHCI_PS_SPEED_GET(x) (((x) >> 9) & 0xF) /* RO - port speed */ +#define XHCI_PS_SPEED_GET(x) (((x) >> 10) & 0xF) /* RO - port speed */ #define XHCI_PS_PIC_GET(x) (((x) >> 14) & 0x3) /* RW - port indicator */ #define XHCI_PS_PIC_SET(x) (((x) & 0x3) << 14) /* RW - port indicator */ #define XHCI_PS_LWS 0x00010000 /* RW - port link state write strobe */ @@ -171,7 +171,7 @@ #define XHCI_ERSTBA_LO(n) (0x0030 + (0x20 * (n))) /* XHCI event ring segment table BA */ #define XHCI_ERSTBA_HI(n) (0x0034 + (0x20 * (n))) /* XHCI event ring segment table BA */ #define XHCI_ERDP_LO(n) (0x0038 + (0x20 * (n))) /* XHCI event ring dequeue pointer */ -#define XHCI_ERDP_LO_SIGET(x) ((x) & 0x7) /* RO - dequeue segment index */ +#define XHCI_ERDP_LO_SINDEX(x) ((x) & 0x7) /* RO - dequeue segment index */ #define XHCI_ERDP_LO_BUSY 0x00000008 /* RW - event handler busy */ #define XHCI_ERDP_HI(n) (0x003C + (0x20 * (n))) /* XHCI event ring dequeue pointer */