diff options
| author | Ralf Kirchner <ralf.kirchner@embedded-brains.de> | 2012-12-05 13:58:19 +0100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2012-12-05 15:26:47 +0100 |
| commit | a0bc1dcbe8f11a21de388261e12bf042db5b069c (patch) | |
| tree | 53466a9d8e384489d0d86d047d87317674814014 /cpukit/libmisc | |
| parent | dosfs: Add skip_alignment for msdos_format() (diff) | |
| download | rtems-a0bc1dcbe8f11a21de388261e12bf042db5b069c.tar.bz2 | |
dosfs: Delete fattype parameter for msdos_format()
Delete fattype parameter of msdos_format_request_param_t because the FAT
type is determined by cluster and disk size.
Estimate FAT type and re-evaluate FAT type after exact parameter
determination.
Diffstat (limited to 'cpukit/libmisc')
| -rw-r--r-- | cpukit/libmisc/shell/main_msdosfmt.c | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/cpukit/libmisc/shell/main_msdosfmt.c b/cpukit/libmisc/shell/main_msdosfmt.c index 000b8e8400..b57d9162d9 100644 --- a/cpukit/libmisc/shell/main_msdosfmt.c +++ b/cpukit/libmisc/shell/main_msdosfmt.c @@ -33,7 +33,6 @@ static int rtems_shell_main_msdos_format( .sectors_per_cluster = 0, .fat_num = 0, .files_per_root_dir = 0, - .fattype = MSDOS_FMT_FATANY, .media = 0, .quick_format = TRUE, .skip_alignment = 0, @@ -92,27 +91,6 @@ static int rtems_shell_main_msdos_format( rqdata.files_per_root_dir = (uint32_t) tmp; break; - case 't': - arg++; - if (arg == argc) { - fprintf (stderr, "error: no FAT type.\n"); - return 1; - } - - if (strcmp (argv[arg], "any") == 0) - rqdata.fattype = MSDOS_FMT_FATANY; - else if (strcmp (argv[arg], "12") == 0) - rqdata.fattype = MSDOS_FMT_FAT12; - else if (strcmp (argv[arg], "16") == 0) - rqdata.fattype = MSDOS_FMT_FAT16; - else if (strcmp (argv[arg], "32") == 0) - rqdata.fattype = MSDOS_FMT_FAT32; - else { - fprintf (stderr, "error: invalid type, can any, 12, 16, or 32\n"); - return 1; - } - break; - case 'v': rqdata.info_level++; break; @@ -146,7 +124,6 @@ static int rtems_shell_main_msdos_format( printf (" %-20s: %" PRIu32 "\n", "sectors per cluster", rqdata.sectors_per_cluster); printf (" %-20s: %" PRIu32 "\n", "fats", rqdata.fat_num); printf (" %-20s: %" PRIu32 "\n", "files per root dir", rqdata.files_per_root_dir); - printf (" %-20s: %i\n", "fat type", rqdata.fattype); printf (" %-20s: %d\n", "media", rqdata.media); printf (" %-20s: %d\n", "quick_format", rqdata.quick_format); printf (" %-20s: %s\n", "skip_alignment", (0 == rqdata.skip_alignment) ? "false" : "true"); @@ -162,7 +139,7 @@ static int rtems_shell_main_msdos_format( return 0; } -#define OPTIONS "[-V label] [-s sectors/cluster] [-r size] [-t any/12/16/32] [-v]" +#define OPTIONS "[-V label] [-s sectors/cluster] [-r size] [-v]" rtems_shell_cmd_t rtems_shell_MSDOSFMT_Command = { "mkdos", /* name */ |