leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb/gadget: fastboot: minor cleanup

Browse Source 
- update static function
- additional debugging statements
- update "fastboot command" information
- add missing include file
- update spelling

Signed-off-by: Steve Rae <srae@broadcom.com>
This commit is contained in:
Steve Rae 2014-08-26 11:47:29 -07:00 committed by Tom Rini
parent d1b5ed0753
commit 593cbd93f3
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/cmd_fastboot.c
View File

@ -30,7 +30,8 @@ static int do_fastboot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
} }
U_BOOT_CMD( U_BOOT_CMD(
fastboot, 1, 1, do_fastboot, fastboot, 1, 0, do_fastboot,
"fastboot - enter USB Fastboot protocol", "use USB Fastboot protocol",
"" "\n"
" - run as a fastboot usb device"
); );

15
drivers/usb/gadget/f_fastboot.c
View File

@ -10,6 +10,7 @@
* *
* SPDX-License-Identifier: GPL-2.0+ * SPDX-License-Identifier: GPL-2.0+
*/ */
#include <config.h>
#include <common.h> #include <common.h>
#include <errno.h> #include <errno.h>
#include <malloc.h> #include <malloc.h>
@ -41,7 +42,7 @@
struct f_fastboot { struct f_fastboot {
struct usb_function usb_function; 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_ep *in_ep, *out_ep;
struct usb_request *in_req, *out_req; 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); 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; struct usb_request *in_req = fastboot_func->in_req;
int ret; int ret;
@ -341,6 +342,7 @@ static void cb_getvar(struct usb_ep *ep, struct usb_request *req)
strsep(&cmd, ":"); strsep(&cmd, ":");
if (!cmd) { if (!cmd) {
error("missing variable\n");
fastboot_tx_write_str("FAILmissing var"); fastboot_tx_write_str("FAILmissing var");
return; return;
} }
@ -361,6 +363,7 @@ static void cb_getvar(struct usb_ep *ep, struct usb_request *req)
else else
strcpy(response, "FAILValue not set"); strcpy(response, "FAILValue not set");
} else { } else {
error("unknown variable: %s\n", cmd);
strcpy(response, "FAILVariable not implemented"); strcpy(response, "FAILVariable not implemented");
} }
fastboot_tx_write_str(response); fastboot_tx_write_str(response);
@ -480,7 +483,7 @@ static void cb_flash(struct usb_ep *ep, struct usb_request *req)
strsep(&cmd, ":"); strsep(&cmd, ":");
if (!cmd) { if (!cmd) {
printf("%s: missing partition name\n", __func__); error("missing partition name\n");
fastboot_tx_write_str("FAILmissing partition name"); fastboot_tx_write_str("FAILmissing partition name");
return; 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"); fastboot_tx_write_str("FAILunknown command");
else } else {
func_cb(ep, req); func_cb(ep, req);
}
if (req->status == 0) { if (req->status == 0) {
*cmdbuf = '\0'; *cmdbuf = '\0';