@ -65,25 +65,33 @@ struct ums *ums_init(const char *devtype, const char *devnum)
int do_usb_mass_storage ( cmd_tbl_t * cmdtp , int flag ,
int do_usb_mass_storage ( cmd_tbl_t * cmdtp , int flag ,
int argc , char * const argv [ ] )
int argc , char * const argv [ ] )
{
{
const char * usb_controller ;
const char * devtype ;
const char * devnum ;
struct ums * ums ;
unsigned int controller_index ;
int rc ;
int cable_ready_timeout __maybe_unused ;
if ( argc < 3 )
if ( argc < 3 )
return CMD_RET_USAGE ;
return CMD_RET_USAGE ;
const char * usb_controller = argv [ 1 ] ;
usb_controller = argv [ 1 ] ;
const char * devtype = " mmc " ;
devtype = " mmc " ;
const char * devnum = argv [ 2 ] ;
devnum = argv [ 2 ] ;
struct ums * ums = ums_init ( devtype , devnum ) ;
ums = ums_init ( devtype , devnum ) ;
if ( ! ums )
if ( ! ums )
return CMD_RET_FAILURE ;
return CMD_RET_FAILURE ;
unsigned int controller_index = ( unsigned int ) ( simple_strtoul (
controller_index = ( unsigned int ) ( simple_strtoul (
usb_controller , NULL , 0 ) ) ;
usb_controller , NULL , 0 ) ) ;
if ( board_usb_init ( controller_index , USB_INIT_DEVICE ) ) {
if ( board_usb_init ( controller_index , USB_INIT_DEVICE ) ) {
error ( " Couldn't init USB controller. " ) ;
error ( " Couldn't init USB controller. " ) ;
return CMD_RET_FAILURE ;
return CMD_RET_FAILURE ;
}
}
int rc = fsg_init ( ums ) ;
rc = fsg_init ( ums ) ;
if ( rc ) {
if ( rc ) {
error ( " fsg_init failed " ) ;
error ( " fsg_init failed " ) ;
return CMD_RET_FAILURE ;
return CMD_RET_FAILURE ;
@ -96,7 +104,7 @@ int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag,
}
}
/* Timeout unit: seconds */
/* Timeout unit: seconds */
int cable_ready_timeout = UMS_CABLE_READY_TIMEOUT ;
cable_ready_timeout = UMS_CABLE_READY_TIMEOUT ;
if ( ! g_dnl_board_usb_cable_connected ( ) ) {
if ( ! g_dnl_board_usb_cable_connected ( ) ) {
/*
/*