From patchwork Tue Aug 26 18:47:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Rae X-Patchwork-Id: 36046 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f71.google.com (mail-pa0-f71.google.com [209.85.220.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 51F6920551 for ; Tue, 26 Aug 2014 18:46:42 +0000 (UTC) Received: by mail-pa0-f71.google.com with SMTP id et14sf127605217pad.2 for ; Tue, 26 Aug 2014 11:46:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list:content-type :content-transfer-encoding; bh=IbhYpXpNh10BWf0tab1i5jPx4tIVY27iQauluJ5SLNc=; b=m9fwNpS80hZRU9OKQ7kqjxF3oOAuxa+BJAPWyQ94aojNH4IB1+o+eIDwLazSLJqDrs ++wkE7MGlAxOTql0HonaAZtJxn1nn7PEd319FdHdruJCxupueduSzPvsMSnvQHKZ7LM+ rMdRg5Q+3PiKMvv8bFXflpCUvp/Lkd9zKY8xB+4mrKw5PXGUwVDh34+JGJlEBvNjXpIv DjZjq4z25ql/jOZeeSAA5CpaEfA4IJTwfsw6Hs1ysnfcvU/wXSAdzv52/xnwDzo7NOTX iZ6/Rqe1CF4ZjakKP+kOjJ94hYKGd3NgHCfRBWMgnqKCTc9l8B49FOF3cf65+qfd2Mbh dKEA== X-Gm-Message-State: ALoCoQkMKdLUshpisNvVkCMulcrPtclw20gDoYSJ62n7dqOTuhHNdU6A+JHhIJ8JuuUIUI3IafSK X-Received: by 10.66.65.75 with SMTP id v11mr4130467pas.30.1409078801558; Tue, 26 Aug 2014 11:46:41 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.31.161 with SMTP id f30ls821748qgf.39.gmail; Tue, 26 Aug 2014 11:46:41 -0700 (PDT) X-Received: by 10.236.140.11 with SMTP id d11mr46251462yhj.39.1409078801355; Tue, 26 Aug 2014 11:46:41 -0700 (PDT) Received: from mail-yh0-f53.google.com (mail-yh0-f53.google.com [209.85.213.53]) by mx.google.com with ESMTPS id m21si3153182yha.152.2014.08.26.11.46.41 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 26 Aug 2014 11:46:41 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.213.53 as permitted sender) client-ip=209.85.213.53; Received: by mail-yh0-f53.google.com with SMTP id c41so12276033yho.40 for ; Tue, 26 Aug 2014 11:46:41 -0700 (PDT) X-Received: by 10.52.119.229 with SMTP id kx5mr2155632vdb.40.1409078801239; Tue, 26 Aug 2014 11:46:41 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.45.67 with SMTP id uj3csp221700vcb; Tue, 26 Aug 2014 11:46:40 -0700 (PDT) X-Received: by 10.180.106.6 with SMTP id gq6mr24129955wib.5.1409078799824; Tue, 26 Aug 2014 11:46:39 -0700 (PDT) Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id xv4si5088311wjb.86.2014.08.26.11.46.39 for ; Tue, 26 Aug 2014 11:46:39 -0700 (PDT) Received-SPF: none (google.com: u-boot-bounces@lists.denx.de does not designate permitted sender hosts) client-ip=85.214.87.163; Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DE72BA74C2; Tue, 26 Aug 2014 20:46:35 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 snqUH23XfTXp; Tue, 26 Aug 2014 20:46:35 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4EE2BA74C6; Tue, 26 Aug 2014 20:46:34 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DC243A74C3 for ; Tue, 26 Aug 2014 20:46:29 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 pLyK7eSUPoCk for ; Tue, 26 Aug 2014 20:46:29 +0200 (CEST) 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-gw3-out.broadcom.com (mail-gw3-out.broadcom.com [216.31.210.64]) by theia.denx.de (Postfix) with ESMTP id 41907A74B3 for ; Tue, 26 Aug 2014 20:46:16 +0200 (CEST) X-IronPort-AV: E=Sophos;i="5.04,405,1406617200"; d="scan'208";a="43506243" Received: from irvexchcas06.broadcom.com (HELO IRVEXCHCAS06.corp.ad.broadcom.com) ([10.9.208.53]) by mail-gw3-out.broadcom.com with ESMTP; 26 Aug 2014 12:01:25 -0700 Received: from IRVEXCHSMTP1.corp.ad.broadcom.com (10.9.207.51) by IRVEXCHCAS06.corp.ad.broadcom.com (10.9.208.53) with Microsoft SMTP Server (TLS) id 14.3.174.1; Tue, 26 Aug 2014 11:46:15 -0700 Received: from mail-irva-13.broadcom.com (10.10.10.20) by IRVEXCHSMTP1.corp.ad.broadcom.com (10.9.207.51) with Microsoft SMTP Server id 14.3.174.1; Tue, 26 Aug 2014 11:46:16 -0700 Received: from mail.broadcom.com (lbrmn-vmlnx03.ric.broadcom.com [10.136.4.105]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id 82C679F9F9; Tue, 26 Aug 2014 11:46:14 -0700 (PDT) From: Steve Rae To: Lukasz Majewski Date: Tue, 26 Aug 2014 11:47:29 -0700 Message-ID: <1409078850-7873-4-git-send-email-srae@broadcom.com> X-Mailer: git-send-email 1.8.5 In-Reply-To: <1409078850-7873-1-git-send-email-srae@broadcom.com> References: <1409078850-7873-1-git-send-email-srae@broadcom.com> MIME-Version: 1.0 Cc: Steve Rae , Marek Vasut , Pantelis Antoniou , u-boot@lists.denx.de, Tom Rini Subject: [U-Boot] [PATCH v6 3/4] usb/gadget: fastboot: minor cleanup X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: srae@broadcom.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.213.53 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 - update static function - additional debugging statements - update "fastboot command" information - add missing include file - update spelling Signed-off-by: Steve Rae --- Changes in v6: - printf() to error() Changes in v5: None Changes in v4: - update debug string as per feedback Changes in v3: None Changes in v2: - new in v2 common/cmd_fastboot.c | 7 ++++--- drivers/usb/gadget/f_fastboot.c | 15 ++++++++++----- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/common/cmd_fastboot.c b/common/cmd_fastboot.c index 83fa7bd..909616d 100644 --- a/common/cmd_fastboot.c +++ b/common/cmd_fastboot.c @@ -30,7 +30,8 @@ static int do_fastboot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) } U_BOOT_CMD( - fastboot, 1, 1, do_fastboot, - "fastboot - enter USB Fastboot protocol", - "" + fastboot, 1, 0, do_fastboot, + "use USB Fastboot protocol", + "\n" + " - run as a fastboot usb device" ); diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c index e2659fa..38c0965 100644 --- a/drivers/usb/gadget/f_fastboot.c +++ b/drivers/usb/gadget/f_fastboot.c @@ -10,6 +10,7 @@ * * SPDX-License-Identifier: GPL-2.0+ */ +#include #include #include #include @@ -41,7 +42,7 @@ struct f_fastboot { struct usb_function usb_function; - /* IN/OUT EP's and correspoinding requests */ + /* IN/OUT EP's and corresponding requests */ struct usb_ep *in_ep, *out_ep; struct usb_request *in_req, *out_req; }; @@ -293,7 +294,7 @@ static int fastboot_add(struct usb_configuration *c) } DECLARE_GADGET_BIND_CALLBACK(usb_dnl_fastboot, fastboot_add); -int fastboot_tx_write(const char *buffer, unsigned int buffer_size) +static int fastboot_tx_write(const char *buffer, unsigned int buffer_size) { struct usb_request *in_req = fastboot_func->in_req; int ret; @@ -341,6 +342,7 @@ static void cb_getvar(struct usb_ep *ep, struct usb_request *req) strsep(&cmd, ":"); if (!cmd) { + error("missing variable\n"); fastboot_tx_write_str("FAILmissing var"); return; } @@ -361,6 +363,7 @@ static void cb_getvar(struct usb_ep *ep, struct usb_request *req) else strcpy(response, "FAILValue not set"); } else { + error("unknown variable: %s\n", cmd); strcpy(response, "FAILVariable not implemented"); } fastboot_tx_write_str(response); @@ -480,7 +483,7 @@ static void cb_flash(struct usb_ep *ep, struct usb_request *req) strsep(&cmd, ":"); if (!cmd) { - printf("%s: missing partition name\n", __func__); + error("missing partition name\n"); fastboot_tx_write_str("FAILmissing partition name"); return; } @@ -534,10 +537,12 @@ static void rx_handler_command(struct usb_ep *ep, struct usb_request *req) } } - if (!func_cb) + if (!func_cb) { + error("unknown command: %s\n", cmdbuf); fastboot_tx_write_str("FAILunknown command"); - else + } else { func_cb(ep, req); + } if (req->status == 0) { *cmdbuf = '\0';