cmd: ubifs: Factor out some checking codes into cmd_ubifs_mount()
cmd_ubifs_mount() function would be called directly instead of involving whole command machinery for mounting ubifs in generic firmware loader, so some checking codes need to be factored out into cmd_ubifs_mount() without breaking original functionality design. Signed-off-by: Tien Fong Chee <tien.fong.chee@intel.com> Reviewed-by: Marek Vasut <marex@denx.de> Reviewed-by: Heiko Schocher <hs@denx.de>
This commit is contained in:
parent
10c2044062
commit
14dfc6482a
22
cmd/ubifs.c
22
cmd/ubifs.c
|
@ -19,16 +19,10 @@
|
||||||
static int ubifs_initialized;
|
static int ubifs_initialized;
|
||||||
static int ubifs_mounted;
|
static int ubifs_mounted;
|
||||||
|
|
||||||
static int do_ubifs_mount(cmd_tbl_t *cmdtp, int flag, int argc,
|
int cmd_ubifs_mount(char *vol_name)
|
||||||
char * const argv[])
|
|
||||||
{
|
{
|
||||||
char *vol_name;
|
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
if (argc != 2)
|
|
||||||
return CMD_RET_USAGE;
|
|
||||||
|
|
||||||
vol_name = argv[1];
|
|
||||||
debug("Using volume %s\n", vol_name);
|
debug("Using volume %s\n", vol_name);
|
||||||
|
|
||||||
if (ubifs_initialized == 0) {
|
if (ubifs_initialized == 0) {
|
||||||
|
@ -42,7 +36,19 @@ static int do_ubifs_mount(cmd_tbl_t *cmdtp, int flag, int argc,
|
||||||
|
|
||||||
ubifs_mounted = 1;
|
ubifs_mounted = 1;
|
||||||
|
|
||||||
return 0;
|
return ret;
|
||||||
|
}
|
||||||
|
static int do_ubifs_mount(cmd_tbl_t *cmdtp, int flag, int argc,
|
||||||
|
char * const argv[])
|
||||||
|
{
|
||||||
|
char *vol_name;
|
||||||
|
|
||||||
|
if (argc != 2)
|
||||||
|
return CMD_RET_USAGE;
|
||||||
|
|
||||||
|
vol_name = argv[1];
|
||||||
|
|
||||||
|
return cmd_ubifs_mount(vol_name);
|
||||||
}
|
}
|
||||||
|
|
||||||
int ubifs_is_mounted(void)
|
int ubifs_is_mounted(void)
|
||||||
|
|
|
@ -75,6 +75,7 @@ extern int ubi_volume_write(char *volume, void *buf, size_t size);
|
||||||
extern int ubi_volume_read(char *volume, char *buf, size_t size);
|
extern int ubi_volume_read(char *volume, char *buf, size_t size);
|
||||||
|
|
||||||
extern struct ubi_device *ubi_devices[];
|
extern struct ubi_device *ubi_devices[];
|
||||||
|
int cmd_ubifs_mount(char *vol_name);
|
||||||
int cmd_ubifs_umount(void);
|
int cmd_ubifs_umount(void);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue