From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-la0-x236.google.com ([2a00:1450:4010:c03::236]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZV5b9-0004A9-Ak for barebox@lists.infradead.org; Thu, 27 Aug 2015 22:24:44 +0000 Received: by labia3 with SMTP id ia3so21640292lab.3 for ; Thu, 27 Aug 2015 15:24:22 -0700 (PDT) From: Antony Pavlov Date: Fri, 28 Aug 2015 01:24:03 +0300 Message-Id: <1440714250-28080-3-git-send-email-antonynpavlov@gmail.com> In-Reply-To: <1440714250-28080-1-git-send-email-antonynpavlov@gmail.com> References: <1440714250-28080-1-git-send-email-antonynpavlov@gmail.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [RFC 2/9] WIP: fix drivers/usb/core/usb.c To: barebox@lists.infradead.org Cc: Peter Mamonov drivers/usb/core/usb.c: In function 'usb_parse_config': drivers/usb/core/usb.c:194:28: error: 'struct usb_configuration' has no member named 'wTotalLength' le16_to_cpus(&(dev->config.wTotalLength)); ^ ... scripts/Makefile.build:249: recipe for target 'drivers/usb/core/usb.o' failed make[3]: *** [drivers/usb/core/usb.o] Error 1 scripts/Makefile.build:387: recipe for target 'drivers/usb/core' failed make[2]: *** [drivers/usb/core] Error 2 scripts/Makefile.build:387: recipe for target 'drivers/usb' failed make[1]: *** [drivers/usb] Error 2 Makefile:770: recipe for target 'drivers' failed make: *** [drivers] Error 2 see also commit 245069bcef15ecc19db616a967501349b76c84d0 Author: Sascha Hauer Date: Thu Jul 10 11:36:12 2014 +0200 USB: introduce usb_interface/usb_configuration structs Currently we have two conflicting definitions of struct usb_config_descriptor and struct usb_interface_descriptor in the tree. This is because the USB code uses additional fields in the structs for internal housekeeping. Add struct usb_interface and struct struct usb_configuration with the housekeeping data and embed the corresponding hardware structs into them. This frees the way to use the definitions from ch9.h in the next step. Signed-off-by: Antony Pavlov --- drivers/usb/core/usb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c index 9073fff..f8d6014 100644 --- a/drivers/usb/core/usb.c +++ b/drivers/usb/core/usb.c @@ -191,7 +191,7 @@ static int usb_parse_config(struct usb_device *dev, unsigned char *buffer, int c return -1; } memcpy(&dev->config, buffer, buffer[0]); - le16_to_cpus(&(dev->config.wTotalLength)); + le16_to_cpus(&(dev->config.desc.wTotalLength)); dev->config.no_of_if = 0; index = dev->config.desc.bLength; -- 2.5.0 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox