From owner-p4-projects@FreeBSD.ORG Thu Aug 6 19:09:00 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B33EF106567A; Thu, 6 Aug 2009 19:08:59 +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 6FE991065673 for ; Thu, 6 Aug 2009 19:08:59 +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 5E6458FC08 for ; Thu, 6 Aug 2009 19:08:59 +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 n76J8xCu085520 for ; Thu, 6 Aug 2009 19:08:59 GMT (envelope-from syl@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n76J8xIt085518 for perforce@freebsd.org; Thu, 6 Aug 2009 19:08:59 GMT (envelope-from syl@FreeBSD.org) Date: Thu, 6 Aug 2009 19:08:59 GMT Message-Id: <200908061908.n76J8xIt085518@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 167073 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: Thu, 06 Aug 2009 19:09:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=167073 Change 167073 by syl@syl_atuin on 2009/08/06 19:08:09 Change field order in xxxdci_softc to permit structure aggregation in the generic_roothub_exec. Affected files ... .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/at91dci.h#3 edit .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/atmegadci.h#3 edit .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/avr32dci.h#2 edit .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/ehci.h#3 edit .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/musb_otg.h#3 edit .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/ohci.h#3 edit .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/s3c24xxdci.h#12 edit .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/uhci.h#3 edit .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/uss820dci.h#3 edit Differences ... ==== //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/at91dci.h#3 (text+ko) ==== @@ -205,6 +205,17 @@ struct usb_bus sc_bus; union at91dci_hub_temp sc_hub_temp; + uint8_t sc_rt_addr; /* root HUB address */ + uint8_t sc_conf; /* root HUB config */ + + struct at91dci_flags sc_flags; + + /* + * The fields before this comment must not change + * it is need by the structure agregation in + * usb_generic_flags + */ + struct usb_device *sc_devices[AT91_MAX_DEVICES]; struct resource *sc_io_res; struct resource *sc_irq_res; @@ -221,13 +232,10 @@ void (*sc_pull_down) (void *arg); void *sc_pull_arg; - uint8_t sc_rt_addr; /* root HUB address */ uint8_t sc_dv_addr; /* device address */ - uint8_t sc_conf; /* root HUB config */ uint8_t sc_hub_idata[1]; - struct at91dci_flags sc_flags; struct at91dci_ep_flags sc_ep_flags[AT91_UDP_EP_MAX]; }; ==== //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/atmegadci.h#3 (text+ko) ==== @@ -254,6 +254,17 @@ struct usb_bus sc_bus; union atmegadci_hub_temp sc_hub_temp; + uint8_t sc_rt_addr; /* root hub address */ + uint8_t sc_conf; /* root hub config */ + + struct atmegadci_flags sc_flags; + + /* + * The fields before this comment must not change + * it is need by the structure agregation in + * usb_generic_flags + */ + /* must be set by by the bus interface layer */ atmegadci_clocks_t *sc_clocks_on; atmegadci_clocks_t *sc_clocks_off; @@ -265,13 +276,9 @@ bus_space_tag_t sc_io_tag; bus_space_handle_t sc_io_hdl; - uint8_t sc_rt_addr; /* root hub address */ uint8_t sc_dv_addr; /* device address */ - uint8_t sc_conf; /* root hub config */ uint8_t sc_hub_idata[1]; - - struct atmegadci_flags sc_flags; }; /* prototypes */ ==== //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/avr32dci.h#2 (text+ko) ==== @@ -221,6 +221,17 @@ struct usb_bus sc_bus; union avr32dci_hub_temp sc_hub_temp; + uint8_t sc_rt_addr; /* root hub address */ + uint8_t sc_conf; /* root hub config */ + + struct avr32dci_flags sc_flags; + + /* + * The fields before this comment must not change + * it is need by the structure agregation in + * usb_generic_flags + */ + /* must be set by by the bus interface layer */ avr32dci_clocks_t *sc_clocks_on; avr32dci_clocks_t *sc_clocks_off; @@ -233,13 +244,9 @@ bus_space_handle_t sc_io_hdl; uint8_t *physdata; - uint8_t sc_rt_addr; /* root hub address */ uint8_t sc_dv_addr; /* device address */ - uint8_t sc_conf; /* root hub config */ uint8_t sc_hub_idata[1]; - - struct avr32dci_flags sc_flags; }; /* prototypes */ ==== //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/ehci.h#3 (text+ko) ==== ==== //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/musb_otg.h#3 (text+ko) ==== @@ -364,6 +364,18 @@ struct musbotg_softc { struct usb_bus sc_bus; union musbotg_hub_temp sc_hub_temp; + + uint8_t sc_rt_addr; /* root HUB address */ + uint8_t sc_conf; /* root HUB config */ + + struct musbotg_flags sc_flags; + + /* + * The fields before this comment must not change + * it is need by the structure agregation in + * usb_generic_flags + */ + struct usb_hw_ep_profile sc_hw_ep_profile[16]; struct usb_device *sc_devices[MUSB2_MAX_DEVICES]; @@ -382,16 +394,12 @@ uint8_t sc_ep_max; /* maximum number of RX and TX * endpoints supported */ - uint8_t sc_rt_addr; /* root HUB address */ uint8_t sc_dv_addr; /* device address */ - uint8_t sc_conf; /* root HUB config */ uint8_t sc_ep0_busy; /* set if ep0 is busy */ uint8_t sc_ep0_cmd; /* pending commands */ uint8_t sc_conf_data; /* copy of hardware register */ uint8_t sc_hub_idata[1]; - - struct musbotg_flags sc_flags; }; /* prototypes */ ==== //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/ohci.h#3 (text+ko) ==== ==== //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/s3c24xxdci.h#12 (text+ko) ==== @@ -241,6 +241,17 @@ struct usb_bus sc_bus; union s3c24dci_hub_temp sc_hub_temp; + uint8_t sc_rt_addr; /* root HUB address */ + uint8_t sc_conf; /* root HUB config */ + + struct s3c24dci_flags sc_flags; + + /* + * The fields before this comment must not change + * it is need by the structure agregation in + * usb_generic_flags + */ + struct usb_device *sc_devices[2]; bus_space_tag_t sc_io_tag; bus_space_handle_t sc_io_hdl; @@ -253,13 +264,9 @@ void (*sc_pull_down) (void *arg); void *sc_pull_arg; - uint8_t sc_rt_addr; /* root HUB address */ uint8_t sc_dv_addr; /* device address */ - uint8_t sc_conf; /* root HUB config */ uint8_t sc_hub_idata[1]; - - struct s3c24dci_flags sc_flags; }; usb_error_t s3c24dci_init(struct s3c24dci_softc *sc); ==== //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/uhci.h#3 (text+ko) ==== ==== //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/uss820dci.h#3 (text+ko) ==== @@ -328,6 +328,17 @@ struct usb_bus sc_bus; union uss820_hub_temp sc_hub_temp; + uint8_t sc_rt_addr; /* root HUB address */ + uint8_t sc_conf; /* root HUB config */ + + struct uss820_flags sc_flags; + + /* + * The fields before this comment must not change + * it is need by the structure agregation in + * usb_generic_flags + */ + struct usb_device *sc_devices[USS820_MAX_DEVICES]; struct resource *sc_io_res; struct resource *sc_irq_res; @@ -336,13 +347,9 @@ bus_space_tag_t sc_io_tag; bus_space_handle_t sc_io_hdl; - uint8_t sc_rt_addr; /* root HUB address */ uint8_t sc_dv_addr; /* device address */ - uint8_t sc_conf; /* root HUB config */ uint8_t sc_hub_idata[1]; - - struct uss820_flags sc_flags; }; /* prototypes */