From owner-p4-projects@FreeBSD.ORG Fri Jul 30 22:07:31 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BFEE61065678; Fri, 30 Jul 2010 22:07:31 +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 6C43F1065676 for ; Fri, 30 Jul 2010 22:07:31 +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 5A70A8FC25 for ; Fri, 30 Jul 2010 22:07:31 +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 o6UM7Van043065 for ; Fri, 30 Jul 2010 22:07:31 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6UM7VQM043063 for perforce@freebsd.org; Fri, 30 Jul 2010 22:07:31 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 30 Jul 2010 22:07:31 GMT Message-Id: <201007302207.o6UM7VQM043063@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 181620 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: Fri, 30 Jul 2010 22:07:32 -0000 http://p4web.freebsd.org/@@181620?ac=10 Change 181620 by hselasky@hselasky_laptop001 on 2010/07/30 22:06:34 USB controller (XHCI): - correct some register definitions Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/xhcireg.h#3 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/xhcireg.h#3 (text+ko) ==== @@ -38,7 +38,7 @@ #define XHCI_CAPLENGTH 0x00 /* RO capability */ #define XHCI_RESERVED 0x01 /* Reserved */ #define XHCI_HCIVERSION 0x02 /* RO Interface version number */ -#define XHCI_HCIVERSION_1_0 0x0090 /* xHCI version 0.9 */ +#define XHCI_HCIVERSION_0_9 0x0090 /* xHCI version 0.9 */ #define XHCI_HCIVERSION_1_0 0x0100 /* xHCI version 1.0 */ #define XHCI_HCSPARAMS1 0x04 /* RO structual parameters 1 */ #define XHCI_HCS1_DEVSLOT_MAX(x)((x) & 0xFF) @@ -110,7 +110,7 @@ #define XHCI_CONFIG_SLOTS_MASK 0x000000FF /* RW - number of device slot enabled */ /* XHCI port status registers */ -#define XHCI_PORTSC(n) (0x400 + (0x10 * (n))) /* XHCI port status */ +#define XHCI_PORTSC(n) (0x3F0 + (0x10 * (n))) /* XHCI port status */ #define XHCI_PS_CCS 0x00000001 /* RO - current connect status */ #define XHCI_PS_PED 0x00000002 /* RW - port enabled / disabled */ #define XHCI_PS_OCA 0x00000008 /* RO - over current active */ @@ -118,7 +118,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_PORT_SPEED(x) (((x) >> 9) & 0xF) /* RO - port speed */ +#define XHCI_PS_SPEED_GET(x) (((x) >> 9) & 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 */ @@ -134,8 +134,10 @@ #define XHCI_PS_WDE 0x04000000 /* RW - wake on disconnect enable */ #define XHCI_PS_WOE 0x08000000 /* RW - wake on over-current enable */ #define XHCI_PS_DR 0x40000000 /* RO - device removable */ -#define XHCI_PS_WPR 0x80000000 /* RW - warm port reset */ -#define XHCI_PORTPMSC(n) (0x404 + (0x10 * (n))) /* XHCI status and control */ +#define XHCI_PS_WPR 0x80000000U /* RW - warm port reset */ +#define XHCI_PS_CLEAR 0x80FF00F7U /* command bits */ + +#define XHCI_PORTPMSC(n) (0x3F4 + (0x10 * (n))) /* XHCI status and control */ #define XHCI_PM3_U1TO_GET(x) (((x) >> 0) & 0xFF) /* RW - U1 timeout */ #define XHCI_PM3_U1TO_SET(x) (((x) & 0xFF) << 0) /* RW - U1 timeout */ #define XHCI_PM3_U2TO_GET(x) (((x) >> 8) & 0xFF) /* RW - U2 timeout */ @@ -148,9 +150,9 @@ #define XHCI_PM2_L1SLOT_GET(x) (((x) >> 8) & 0xFF) /* RW - L1 device slot */ #define XHCI_PM2_L1SLOT_SET(x) (((x) & 0xFF) << 8) /* RW - L1 device slot */ #define XHCI_PM2_HLE 0x00010000 /* RW - hardware LPM enable */ -#define XHCI_PORTLI(n) (0x408 + (0x10 * (n))) /* XHCI port link info */ +#define XHCI_PORTLI(n) (0x3F8 + (0x10 * (n))) /* XHCI port link info */ #define XHCI_PLI3_ERR_GET(x) (((x) >> 0) & 0xFFFF) /* RO - port link errors */ -#define XHCI_PORTRSV(n) (0x40C + (0x10 * (n))) /* XHCI port reserved */ +#define XHCI_PORTRSV(n) (0x3FC + (0x10 * (n))) /* XHCI port reserved */ /* XHCI runtime registers. Offset given by XHCI_CAPLENGTH + XHCI_RTSOFF registers */ #define XHCI_MFINDEX 0x0000 /* RO - microframe index */