From owner-p4-projects@FreeBSD.ORG Sun Aug 9 15:22:30 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 37A301065674; Sun, 9 Aug 2009 15:22:30 +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 D322A1065672 for ; Sun, 9 Aug 2009 15:22:29 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B83E28FC28 for ; Sun, 9 Aug 2009 15:22:29 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n79FMTSU024677 for ; Sun, 9 Aug 2009 15:22:29 GMT (envelope-from syl@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n79FMTRu024675 for perforce@freebsd.org; Sun, 9 Aug 2009 15:22:29 GMT (envelope-from syl@FreeBSD.org) Date: Sun, 9 Aug 2009 15:22:29 GMT Message-Id: <200908091522.n79FMTRu024675@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to syl@FreeBSD.org using -f From: Sylvestre Gallon To: Perforce Change Reviews Cc: Subject: PERFORCE change 167135 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: Sun, 09 Aug 2009 15:22:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=167135 Change 167135 by syl@syl_twoflowers on 2009/08/09 15:21:38 Modify flags order to allow softc aggregation. Affected files ... .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/at91dci.h#4 edit .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/atmegadci.h#4 edit .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/avr32dci.h#3 edit .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/ehci.h#4 edit .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/musb_otg.h#4 edit .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/ohci.h#4 edit .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/s3c24xxdci.h#13 edit .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/uhci.h#4 edit .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/uss820dci.h#4 edit .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_roothub_exec.c#3 edit Differences ... ==== //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/at91dci.h#4 (text+ko) ==== ==== //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/atmegadci.h#4 (text+ko) ==== ==== //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/avr32dci.h#3 (text+ko) ==== ==== //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/ehci.h#4 (text+ko) ==== ==== //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/musb_otg.h#4 (text+ko) ==== @@ -352,13 +352,13 @@ uint8_t status_suspend:1; /* set if suspended */ uint8_t status_vbus:1; /* set if present */ uint8_t status_bus_reset:1; /* set if reset complete */ - uint8_t status_high_speed:1; /* set if High Speed is selected */ uint8_t remote_wakeup:1; uint8_t self_powered:1; uint8_t clocks_off:1; uint8_t port_powered:1; uint8_t port_enabled:1; uint8_t d_pulled_up:1; + uint8_t status_high_speed:1; /* set if High Speed is selected */ }; struct musbotg_softc { ==== //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/ohci.h#4 (text+ko) ==== ==== //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/s3c24xxdci.h#13 (text+ko) ==== ==== //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/uhci.h#4 (text+ko) ==== ==== //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/uss820dci.h#4 (text+ko) ==== @@ -317,6 +317,7 @@ uint8_t status_suspend:1; /* set if suspended */ uint8_t status_vbus:1; /* set if present */ uint8_t status_bus_reset:1; /* set if reset complete */ + uint8_t dummy_entry:1; uint8_t clocks_off:1; uint8_t port_powered:1; uint8_t port_enabled:1; ==== //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_roothub_exec.c#3 (text+ko) ==== @@ -61,7 +61,17 @@ #include struct usb_generic_flags { - + uint8_t change_connect:1; + uint8_t change_suspend:1; + uint8_t status_suspend:1; + uint8_t status_vbus:1; + uint8_t status_bus_reset:1; + uint8_t remote_wakeup:1; + uint8_t self_powered:1; + uint8_t clocks_off:1; + uint8_t port_powered:1; + uint8_t port_enabled:1; + uint8_t d_pulled_up:1; }; struct usb_generic_hub_temp { @@ -80,7 +90,7 @@ }; static usb_error_t -genric_roothub_exec(struct usb_device *udev, +genric_roothub_exec(struct usb_device *udev, struct usb_generic_softc *sc, struct usb_device_request *req, const void **pptr, uint16_t *plength) { const void *ptr; @@ -88,4 +98,5 @@ uint16_t value; uint16_t index; usb_error_t err; + }