summaryrefslogtreecommitdiffstats
path: root/common/cmd_usb_mass_storage.c
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2016-01-17 20:53:51 -0700
committerTom Rini <trini@konsulko.com>2016-01-25 10:39:43 -0500
commit72a8cf8dccf6f8b86d1683205e032a94eaa86938 (patch)
treeb29378eb8af182f0faf2028cb52465a021de40cc /common/cmd_usb_mass_storage.c
parent25d5352c71dcc599030a4a764d8087185ed537d3 (diff)
downloadtalos-obmc-uboot-72a8cf8dccf6f8b86d1683205e032a94eaa86938.tar.gz
talos-obmc-uboot-72a8cf8dccf6f8b86d1683205e032a94eaa86938.zip
Move all command code into its own directory
There are a lot of unrelated files in common, including all of the commands. Moving them into their own directory makes them easier to find and is more logical. Some commands include non-command code, such as cmd_scsi.c. This should be sorted out at some point so that the function can be enabled with or without the associated command. Unfortunately, with m68k I get this error: m68k: + M5329AFEE +arch/m68k/cpu/mcf532x/start.o: In function `_start': +arch/m68k/cpu/mcf532x/start.S:159:(.text+0x452): relocation truncated to fit: R_68K_PC16 against symbol `board_init_f' defined in .text.board_init_f section in common/built-in.o I hope someone can shed some light on what this means. I hope it isn't depending on the position of code in the image. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Heiko Schocher <hs@denx.de> Acked-by: Stefan Roese <sr@denx.de> Acked-by: Przemyslaw Marczak <p.marczak@samsung.com>
Diffstat (limited to 'common/cmd_usb_mass_storage.c')
-rw-r--r--common/cmd_usb_mass_storage.c235
1 files changed, 0 insertions, 235 deletions
diff --git a/common/cmd_usb_mass_storage.c b/common/cmd_usb_mass_storage.c
deleted file mode 100644
index 041559172d..0000000000
--- a/common/cmd_usb_mass_storage.c
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- * Copyright (C) 2011 Samsung Electronics
- * Lukasz Majewski <l.majewski@samsung.com>
- *
- * Copyright (c) 2015, NVIDIA CORPORATION. All rights reserved.
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-
-#include <errno.h>
-#include <common.h>
-#include <command.h>
-#include <console.h>
-#include <g_dnl.h>
-#include <part.h>
-#include <usb.h>
-#include <usb_mass_storage.h>
-
-static int ums_read_sector(struct ums *ums_dev,
- ulong start, lbaint_t blkcnt, void *buf)
-{
- block_dev_desc_t *block_dev = &ums_dev->block_dev;
- lbaint_t blkstart = start + ums_dev->start_sector;
-
- return block_dev->block_read(block_dev, blkstart, blkcnt, buf);
-}
-
-static int ums_write_sector(struct ums *ums_dev,
- ulong start, lbaint_t blkcnt, const void *buf)
-{
- block_dev_desc_t *block_dev = &ums_dev->block_dev;
- lbaint_t blkstart = start + ums_dev->start_sector;
-
- return block_dev->block_write(block_dev, blkstart, blkcnt, buf);
-}
-
-static struct ums *ums;
-static int ums_count;
-
-static void ums_fini(void)
-{
- int i;
-
- for (i = 0; i < ums_count; i++)
- free((void *)ums[i].name);
- free(ums);
- ums = 0;
- ums_count = 0;
-}
-
-#define UMS_NAME_LEN 16
-
-static int ums_init(const char *devtype, const char *devnums)
-{
- char *s, *t, *devnum, *name;
- block_dev_desc_t *block_dev;
- int ret;
- struct ums *ums_new;
-
- s = strdup(devnums);
- if (!s)
- return -1;
-
- t = s;
- ums_count = 0;
-
- for (;;) {
- devnum = strsep(&t, ",");
- if (!devnum)
- break;
-
- ret = get_device(devtype, devnum, &block_dev);
- if (ret < 0)
- goto cleanup;
-
- /* f_mass_storage.c assumes SECTOR_SIZE sectors */
- if (block_dev->blksz != SECTOR_SIZE) {
- ret = -1;
- goto cleanup;
- }
-
- ums_new = realloc(ums, (ums_count + 1) * sizeof(*ums));
- if (!ums_new) {
- ret = -1;
- goto cleanup;
- }
- ums = ums_new;
-
- ums[ums_count].read_sector = ums_read_sector;
- ums[ums_count].write_sector = ums_write_sector;
- ums[ums_count].start_sector = 0;
- ums[ums_count].num_sectors = block_dev->lba;
- name = malloc(UMS_NAME_LEN);
- if (!name) {
- ret = -1;
- goto cleanup;
- }
- snprintf(name, UMS_NAME_LEN, "UMS disk %d", ums_count);
- ums[ums_count].name = name;
- ums[ums_count].block_dev = *block_dev;
-
- printf("UMS: LUN %d, dev %d, hwpart %d, sector %#x, count %#x\n",
- ums_count, ums[ums_count].block_dev.dev,
- ums[ums_count].block_dev.hwpart,
- ums[ums_count].start_sector,
- ums[ums_count].num_sectors);
-
- ums_count++;
- }
-
- if (!ums_count)
- ret = -1;
- else
- ret = 0;
-
-cleanup:
- free(s);
-
- if (ret < 0)
- ums_fini();
-
- return ret;
-}
-
-int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag,
- int argc, char * const argv[])
-{
- const char *usb_controller;
- const char *devtype;
- const char *devnum;
- unsigned int controller_index;
- int rc;
- int cable_ready_timeout __maybe_unused;
-
- if (argc < 3)
- return CMD_RET_USAGE;
-
- usb_controller = argv[1];
- if (argc >= 4) {
- devtype = argv[2];
- devnum = argv[3];
- } else {
- devtype = "mmc";
- devnum = argv[2];
- }
-
- rc = ums_init(devtype, devnum);
- if (rc < 0)
- return CMD_RET_FAILURE;
-
- 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.");
- rc = CMD_RET_FAILURE;
- goto cleanup_ums_init;
- }
-
- rc = fsg_init(ums, ums_count);
- if (rc) {
- error("fsg_init failed");
- rc = CMD_RET_FAILURE;
- goto cleanup_board;
- }
-
- rc = g_dnl_register("usb_dnl_ums");
- if (rc) {
- error("g_dnl_register failed");
- rc = CMD_RET_FAILURE;
- goto cleanup_board;
- }
-
- /* Timeout unit: seconds */
- 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");
- rc = CMD_RET_SUCCESS;
- goto cleanup_register;
- }
- if (!cable_ready_timeout) {
- puts("\rUSB cable not detected.\n" \
- "Command exit.\n");
- rc = CMD_RET_SUCCESS;
- goto cleanup_register;
- }
-
- printf("\rAuto exit in: %.2d s.", cable_ready_timeout);
- mdelay(1000);
- cable_ready_timeout--;
- }
- puts("\r\n");
- }
-
- while (1) {
- usb_gadget_handle_interrupts(controller_index);
-
- 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");
-
- rc = CMD_RET_SUCCESS;
- goto cleanup_register;
- }
- }
-
-cleanup_register:
- g_dnl_unregister();
-cleanup_board:
- board_usb_cleanup(controller_index, USB_INIT_DEVICE);
-cleanup_ums_init:
- ums_fini();
-
- return rc;
-}
-
-U_BOOT_CMD(ums, 4, 1, do_usb_mass_storage,
- "Use the UMS [USB Mass Storage]",
- "<USB_controller> [<devtype>] <devnum> e.g. ums 0 mmc 0\n"
- " devtype defaults to mmc"
-);
OpenPOWER on IntegriCloud