From owner-svn-src-projects@FreeBSD.ORG Sat Dec 20 02:45:42 2008 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D491B106564A; Sat, 20 Dec 2008 02:45:42 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A7F418FC18; Sat, 20 Dec 2008 02:45:42 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mBK2jgiV089601; Sat, 20 Dec 2008 02:45:42 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBK2jgQo089598; Sat, 20 Dec 2008 02:45:42 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200812200245.mBK2jgQo089598@svn.freebsd.org> From: Sam Leffler Date: Sat, 20 Dec 2008 02:45:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r186350 - in projects/cambria/sys: arm/conf conf dev/usb X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Dec 2008 02:45:42 -0000 Author: sam Date: Sat Dec 20 02:45:42 2008 New Revision: 186350 URL: http://svn.freebsd.org/changeset/base/186350 Log: add USB_EHCI_BIG_ENDIAN_DESC option to enable bi-endian EHCI descriptor format handling and enable it for CAMBRIA Modified: projects/cambria/sys/arm/conf/CAMBRIA projects/cambria/sys/conf/options projects/cambria/sys/dev/usb/ehcivar.h Modified: projects/cambria/sys/arm/conf/CAMBRIA ============================================================================== --- projects/cambria/sys/arm/conf/CAMBRIA Sat Dec 20 01:29:19 2008 (r186349) +++ projects/cambria/sys/arm/conf/CAMBRIA Sat Dec 20 02:45:42 2008 (r186350) @@ -101,8 +101,8 @@ device random # Entrop # NB: 2 USB 2.0 ports standard device usb -options USB_DEBUG -device ohci +options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order +#options USB_DEBUG device ehci device ugen device umass Modified: projects/cambria/sys/conf/options ============================================================================== --- projects/cambria/sys/conf/options Sat Dec 20 01:29:19 2008 (r186349) +++ projects/cambria/sys/conf/options Sat Dec 20 02:45:42 2008 (r186350) @@ -627,6 +627,7 @@ BUS_DEBUG opt_bus.h # options for USB support USB_DEBUG opt_usb.h USBVERBOSE opt_usb.h +USB_EHCI_BIG_ENDIAN_DESC opt_usb.h U3G_DEBUG opt_u3g.h UKBD_DFLT_KEYMAP opt_ukbd.h UPLCOM_INTR_INTERVAL opt_uplcom.h Modified: projects/cambria/sys/dev/usb/ehcivar.h ============================================================================== --- projects/cambria/sys/dev/usb/ehcivar.h Sat Dec 20 01:29:19 2008 (r186349) +++ projects/cambria/sys/dev/usb/ehcivar.h Sat Dec 20 02:45:42 2008 (r186350) @@ -199,6 +199,7 @@ typedef struct ehci_softc { #define EOWRITE2(sc, a, x) bus_space_write_2((sc)->iot, (sc)->ioh, (sc)->sc_offs+(a), (x)) #define EOWRITE4(sc, a, x) bus_space_write_4((sc)->iot, (sc)->ioh, (sc)->sc_offs+(a), (x)) +#ifdef USB_EHCI_BIG_ENDIAN_DESC /* * Handle byte order conversion between host and ``host controller''. * Typically the latter is little-endian but some controllers require @@ -227,6 +228,34 @@ hc16toh(const struct ehci_softc *sc, con { return sc->sc_flags & EHCI_SCFLG_BIGEDESC ? be16toh(v) : le16toh(v); } +#else +/* + * Normal little-endian only conversion routines. + */ +static __inline uint32_t +htohc32(const struct ehci_softc *sc, const uint32_t v) +{ + return htole32(v); +} + +static __inline uint16_t +htohc16(const struct ehci_softc *sc, const uint16_t v) +{ + return htole16(v); +} + +static __inline uint32_t +hc32toh(const struct ehci_softc *sc, const uint32_t v) +{ + return le32toh(v); +} + +static __inline uint16_t +hc16toh(const struct ehci_softc *sc, const uint16_t v) +{ + return le16toh(v); +} +#endif usbd_status ehci_init(ehci_softc_t *); int ehci_intr(void *);