mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-08 05:43:21 +09:00
75504e9592
Former usb_cable_connected() patch broke compilation of boards which do not support this feature. I've renamed usb_cable_connected() to g_dnl_usb_cable_connected() and added its default implementation to gadget downloader driver code. There's only one driver of this kind and it's unlikely there'll be another, so there's no point in keeping it in /common. Previously this function was declared in usb.h. I've moved it, since it's more appropriate to keep it in g_dnl.h - usb.h seems to be intended for USB host implementation. Existing code, confronted with default -EOPNOTSUPP return value, continues as if the cable was connected. CONFIG_USB_CABLE_CHECK was removed. Change-Id: Ib9198621adee2811b391c64512f14646cefd0369 Signed-off-by: Mateusz Zalega <m.zalega@samsung.com> Acked-by: Marek Vasut <marex@denx.de> Acked-by: Lukasz Majewski <l.majewski@samsung.com>
98 lines
2.0 KiB
C
98 lines
2.0 KiB
C
/*
|
|
* Copyright (C) 2011 Samsung Electronics
|
|
* Lukasz Majewski <l.majewski@samsung.com>
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0+
|
|
*/
|
|
|
|
#include <errno.h>
|
|
#include <common.h>
|
|
#include <command.h>
|
|
#include <g_dnl.h>
|
|
#include <usb.h>
|
|
#include <usb_mass_storage.h>
|
|
|
|
int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag,
|
|
int argc, char * const argv[])
|
|
{
|
|
if (argc < 3)
|
|
return CMD_RET_USAGE;
|
|
|
|
const char *usb_controller = argv[1];
|
|
const char *mmc_devstring = argv[2];
|
|
|
|
unsigned int dev_num = simple_strtoul(mmc_devstring, NULL, 0);
|
|
|
|
struct ums *ums = ums_init(dev_num);
|
|
if (!ums)
|
|
return CMD_RET_FAILURE;
|
|
|
|
unsigned int controller_index = (unsigned int)(simple_strtoul(
|
|
usb_controller, NULL, 0));
|
|
if (board_usb_init(controller_index, USB_INIT_DEVICE)) {
|
|
error("Couldn't init USB controller.");
|
|
return CMD_RET_FAILURE;
|
|
}
|
|
|
|
int rc = fsg_init(ums);
|
|
if (rc) {
|
|
error("fsg_init failed");
|
|
return CMD_RET_FAILURE;
|
|
}
|
|
|
|
g_dnl_register("ums");
|
|
|
|
/* Timeout unit: seconds */
|
|
int cable_ready_timeout = UMS_CABLE_READY_TIMEOUT;
|
|
|
|
if (!g_dnl_board_usb_cable_connected()) {
|
|
/*
|
|
* Won't execute if we don't know whether the cable is
|
|
* connected.
|
|
*/
|
|
puts("Please connect USB cable.\n");
|
|
|
|
while (!g_dnl_board_usb_cable_connected()) {
|
|
if (ctrlc()) {
|
|
puts("\rCTRL+C - Operation aborted.\n");
|
|
goto exit;
|
|
}
|
|
if (!cable_ready_timeout) {
|
|
puts("\rUSB cable not detected.\n" \
|
|
"Command exit.\n");
|
|
goto exit;
|
|
}
|
|
|
|
printf("\rAuto exit in: %.2d s.", cable_ready_timeout);
|
|
mdelay(1000);
|
|
cable_ready_timeout--;
|
|
}
|
|
puts("\r\n");
|
|
}
|
|
|
|
while (1) {
|
|
usb_gadget_handle_interrupts();
|
|
|
|
rc = fsg_main_thread(NULL);
|
|
if (rc) {
|
|
/* Check I/O error */
|
|
if (rc == -EIO)
|
|
printf("\rCheck USB cable connection\n");
|
|
|
|
/* Check CTRL+C */
|
|
if (rc == -EPIPE)
|
|
printf("\rCTRL+C - Operation aborted\n");
|
|
|
|
goto exit;
|
|
}
|
|
}
|
|
exit:
|
|
g_dnl_unregister();
|
|
return CMD_RET_SUCCESS;
|
|
}
|
|
|
|
U_BOOT_CMD(ums, CONFIG_SYS_MAXARGS, 1, do_usb_mass_storage,
|
|
"Use the UMS [User Mass Storage]",
|
|
"ums <USB_controller> <mmc_dev> e.g. ums 0 0"
|
|
);
|