From patchwork Sun Jan 3 20:50:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 562196 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 1CA1814031C for ; Mon, 4 Jan 2016 07:50:59 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b=WIqcBuUf; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E0CC44B830; Sun, 3 Jan 2016 21:50:55 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id t8Y4zq4zK3sW; Sun, 3 Jan 2016 21:50:55 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1FD974B83A; Sun, 3 Jan 2016 21:50:50 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 658134B7FA for ; Sun, 3 Jan 2016 21:50:45 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hiaf3PGW-Jtw for ; Sun, 3 Jan 2016 21:50:45 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-oi0-f48.google.com (mail-oi0-f48.google.com [209.85.218.48]) by theia.denx.de (Postfix) with ESMTPS id 030AD4B7EF for ; Sun, 3 Jan 2016 21:50:40 +0100 (CET) Received: by mail-oi0-f48.google.com with SMTP id y66so246030251oig.0 for ; Sun, 03 Jan 2016 12:50:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=UEjanbIQCTIq3NoszU4391CgXUPBH2231R4iJPXMeK8=; b=WIqcBuUf4b4sLav5+dzt3oKA9Bt2KBE6QPnVGrWMKEDJ/qLUsx6b+CsgOHboSf2fXB y1ZU9qELFGfYXbX/w6jkeAW1EYEhzUajtriJqvk8yKgMIjzLqX6qFcIknAr3Iew0OIqb 30ccs8AfH5qMgJKOiK1iuy2QUFzv/yvZqKKSMswk8TYBunzxM+sapirDKpY2AjB52Gw/ LYv6jlEfKFVfCMwTsQ6PcEfF9Jceb4B43FfQPn8aHomDp5FJw/DI6bm5XD4BPwAiFCSH IIxELCl/nCO7tH/1rOsOWO/gDuoZwsDleiOepm0Ru9Ef9g4Dc6JsEzK6DwCgAOB4amMJ g6ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=UEjanbIQCTIq3NoszU4391CgXUPBH2231R4iJPXMeK8=; b=HSlggcPBXVY7c0P4p+tDF/TMcRXuUq+yMwLrPz11CbQC0LT3zR+vaYJcpbCpQHgEn1 4FcFtBAFKlbXUIWmUomtHfITtPVQrW6kwh79sqws2+azb7mUJQ01UlAuZRDS8oUAo/ef 3zGgCPg5x0pszGyPrXVwwSa8hftkG58JjodBJUy0C1B8yzUJ8juodsm1hnsl5bCWMCsz ZG2PZoMJpcYsfA/hbcxmq/mKdqMb7vTn/1do1U65T46DqzGhQqtQa7YqnsroHVdJSnTN mpXnFZh2A5BxR8M7/J5uGnF2EJe2uxZGa+S5WOSoKGTEAeRVd/w8WwtrlfYbFkTrOlY4 bh4A== X-Gm-Message-State: ALoCoQmmeKSb2yEG7mR5yLzWFtW3eKrP5nY7aKKDMpRNJi1Jr5/RlczaNWa60uTj0DAsKmW9h3p4TbEVM2T86hLFd1yZ5/fCMg== X-Received: by 10.202.173.9 with SMTP id w9mr54179767oie.79.1451854239362; Sun, 03 Jan 2016 12:50:39 -0800 (PST) Received: from kaki.bld.corp.google.com ([2620:0:1005:1100:7c00:6345:ab74:4b50]) by smtp.gmail.com with ESMTPSA id dc19sm12314117obb.0.2016.01.03.12.50.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 03 Jan 2016 12:50:38 -0800 (PST) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 2031F220A1B; Sun, 3 Jan 2016 13:50:36 -0700 (MST) From: Simon Glass To: U-Boot Mailing List Date: Sun, 3 Jan 2016 13:50:30 -0700 Message-Id: <1451854231-20916-2-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.6.0.rc2.230.g3dd15c0 In-Reply-To: <1451854231-20916-1-git-send-email-sjg@chromium.org> References: <1451854231-20916-1-git-send-email-sjg@chromium.org> Cc: Marek Vasut , Joe Hershberger , Jagan Teki , Radha Mohan Chintakuntla , Franck Jullien Subject: [U-Boot] [PATCH 2/3] usb: Allow up to 7 storage devices X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" The current limit of 5 is not enough for the driver model USB tests. Really we should not have a limit but the driver model code still uses the usb_dev_desc[] array, which has a limit. Increasing the limit by 2 should not bother anyone. Adjust it. Signed-off-by: Simon Glass Reviewed-by: Marek Vasut --- common/usb_storage.c | 2 +- include/usb.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/usb_storage.c b/common/usb_storage.c index 4fa6538..e61a8c8 100644 --- a/common/usb_storage.c +++ b/common/usb_storage.c @@ -65,7 +65,7 @@ static const unsigned char us_direction[256/8] = { static ccb usb_ccb __attribute__((aligned(ARCH_DMA_MINALIGN))); static __u32 CBWTag; -#define USB_MAX_STOR_DEV 5 +#define USB_MAX_STOR_DEV 7 static int usb_max_devs; /* number of highest available usb device */ static block_dev_desc_t usb_dev_desc[USB_MAX_STOR_DEV]; diff --git a/include/usb.h b/include/usb.h index 55b9268..7d6ad70 100644 --- a/include/usb.h +++ b/include/usb.h @@ -227,7 +227,7 @@ int board_usb_cleanup(int index, enum usb_init_type init); #ifdef CONFIG_USB_STORAGE -#define USB_MAX_STOR_DEV 5 +#define USB_MAX_STOR_DEV 7 block_dev_desc_t *usb_stor_get_dev(int index); int usb_stor_scan(int mode); int usb_stor_info(void);