| Message ID | 1408823626-12744-4-git-send-email-srae@broadcom.com |
|---|---|
| State | New |
| Headers | show |
Hi Steve, > - update static function > - additional debugging statements > - update "fastboot command" information > - add missing include file > - update spelling > > Signed-off-by: Steve Rae <srae@broadcom.com> > --- > > 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 | 13 +++++++++---- > 2 files changed, 13 insertions(+), 7 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..3b588a9 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 <config.h> > #include <common.h> > #include <errno.h> > #include <malloc.h> > @@ -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) { > + printf("%s: missing variable\n", __func__); It is up to you if you would consider changing printf() to error(). > 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 { > + printf("%s: unknown variable: %s\n", __func__, cmd); printf() -> error() > strcpy(response, "FAILVariable not implemented"); > } > fastboot_tx_write_str(response); > @@ -534,10 +537,12 @@ static void rx_handler_command(struct usb_ep > *ep, struct usb_request *req) } > } > > - if (!func_cb) > + if (!func_cb) { > + printf("%s: unknown command: %s\n", __func__, > cmdbuf); fastboot_tx_write_str("FAILunknown command"); > - else > + } else { > func_cb(ep, req); > + } > > if (req->status == 0) { > *cmdbuf = '\0';
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..3b588a9 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 <config.h> #include <common.h> #include <errno.h> #include <malloc.h> @@ -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) { + printf("%s: missing variable\n", __func__); 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 { + printf("%s: unknown variable: %s\n", __func__, cmd); strcpy(response, "FAILVariable not implemented"); } fastboot_tx_write_str(response); @@ -534,10 +537,12 @@ static void rx_handler_command(struct usb_ep *ep, struct usb_request *req) } } - if (!func_cb) + if (!func_cb) { + printf("%s: unknown command: %s\n", __func__, cmdbuf); fastboot_tx_write_str("FAILunknown command"); - else + } else { func_cb(ep, req); + } if (req->status == 0) { *cmdbuf = '\0';
- update static function - additional debugging statements - update "fastboot command" information - add missing include file - update spelling Signed-off-by: Steve Rae <srae@broadcom.com> --- 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 | 13 +++++++++---- 2 files changed, 13 insertions(+), 7 deletions(-)