dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-01 16:52:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

cmd_reiser: use common get_device_and_partition function

Browse Source 
Convert reiserload and reiserls to use common device and partition parsing
function. With the common function "dev:part" can come from the
environment and a '-' can be used in that case.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
This commit is contained in:
Rob Herring
2012-08-23 11:31:50 +00:00
committed by Tom Rini
parent 4120457044
commit 650f36641c
3 changed files with 28 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
common/cmd_reiser.c
View File

@@ -50,43 +50,27 @@
int do_reiserls (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int do_reiserls (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
char *filename = "/"; char *filename = "/";
int dev=0; int dev, part;
int part=1;
char *ep;
block_dev_desc_t *dev_desc=NULL; block_dev_desc_t *dev_desc=NULL;
int part_length; disk_partition_t info;
if (argc < 3) if (argc < 3)
return CMD_RET_USAGE; return CMD_RET_USAGE;
dev = (int)simple_strtoul (argv[2], &ep, 16); part = get_device_and_partition(argv[1], argv[2], &dev_desc, &info);
dev_desc = get_dev(argv[1],dev); if (part < 0)
if (dev_desc == NULL) {
printf ("\n** Block device %s %d not supported\n", argv[1], dev);
return 1; return 1;
}
if (*ep) {
if (*ep != ':') {
puts ("\n** Invalid boot device, use `dev[:part]' **\n");
return 1;
}
part = (int)simple_strtoul(++ep, NULL, 16);
}
if (argc == 4) { if (argc == 4) {
filename = argv[3]; filename = argv[3];
} }
dev = dev_desc->dev;
PRINTF("Using device %s %d:%d, directory: %s\n", argv[1], dev, part, filename); PRINTF("Using device %s %d:%d, directory: %s\n", argv[1], dev, part, filename);
if ((part_length = reiserfs_set_blk_dev(dev_desc, part)) == 0) { reiserfs_set_blk_dev(dev_desc, &info);
printf ("** Bad partition - %s %d:%d **\n", argv[1], dev, part);
return 1;
}
if (!reiserfs_mount(part_length)) { if (!reiserfs_mount(info.size)) {
printf ("** Bad Reiserfs partition or disk - %s %d:%d **\n", argv[1], dev, part); printf ("** Bad Reiserfs partition or disk - %s %d:%d **\n", argv[1], dev, part);
return 1; return 1;
} }
@@ -112,9 +96,8 @@ U_BOOT_CMD(
int do_reiserload (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int do_reiserload (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
char *filename = NULL; char *filename = NULL;
char *ep; int dev, part;
int dev, part = 0; ulong addr = 0, filelen;
ulong addr = 0, part_length, filelen;
disk_partition_t info; disk_partition_t info;
block_dev_desc_t *dev_desc = NULL; block_dev_desc_t *dev_desc = NULL;
char buf [12]; char buf [12];
@@ -157,49 +140,19 @@ int do_reiserload (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
return 1; return 1;
} }
dev = (int)simple_strtoul (argv[2], &ep, 16); part = get_device_and_partition(argv[1], argv[2], &dev_desc, &info);
dev_desc = get_dev(argv[1],dev); if (part < 0)
if (dev_desc==NULL) {
printf ("\n** Block device %s %d not supported\n", argv[1], dev);
return 1; return 1;
}
if (*ep) {
if (*ep != ':') {
puts ("\n** Invalid boot device, use `dev[:part]' **\n");
return 1;
}
part = (int)simple_strtoul(++ep, NULL, 16);
}
PRINTF("Using device %s%d, partition %d\n", argv[1], dev, part); dev = dev_desc->dev;
if (part != 0) { printf("Loading file \"%s\" from %s device %d%c%c\n",
if (get_partition_info (dev_desc, part, &info)) { filename, argv[1], dev,
printf ("** Bad partition %d **\n", part); part ? ':' : ' ', part ? part + '0' : ' ');
return 1;
}
if (strncmp((char *)info.type, BOOT_PART_TYPE, sizeof(info.type)) != 0) { reiserfs_set_blk_dev(dev_desc, &info);
printf ("\n** Invalid partition type \"%.32s\""
" (expect \"" BOOT_PART_TYPE "\")\n",
info.type);
return 1;
}
PRINTF ("\nLoading from block device %s device %d, partition %d: "
"Name: %.32s Type: %.32s File:%s\n",
argv[1], dev, part, info.name, info.type, filename);
} else {
PRINTF ("\nLoading from block device %s device %d, File:%s\n",
argv[1], dev, filename);
}
if (!reiserfs_mount(info.size)) {
if ((part_length = reiserfs_set_blk_dev(dev_desc, part)) == 0) {
printf ("** Bad partition - %s %d:%d **\n", argv[1], dev, part);
return 1;
}
if (!reiserfs_mount(part_length)) {
printf ("** Bad Reiserfs partition or disk - %s %d:%d **\n", argv[1], dev, part); printf ("** Bad Reiserfs partition or disk - %s %d:%d **\n", argv[1], dev, part);
return 1; return 1;
} }

29
fs/reiserfs/dev.c
View File

@@ -25,24 +25,13 @@
#include "reiserfs_private.h" #include "reiserfs_private.h"
static block_dev_desc_t *reiserfs_block_dev_desc; static block_dev_desc_t *reiserfs_block_dev_desc;
static disk_partition_t part_info; static disk_partition_t *part_info;
int reiserfs_set_blk_dev(block_dev_desc_t *rbdd, int part) void reiserfs_set_blk_dev(block_dev_desc_t *rbdd, disk_partition_t *info)
{ {
reiserfs_block_dev_desc = rbdd; reiserfs_block_dev_desc = rbdd;
part_info = info;
if (part == 0) {
/* disk doesn't use partition table */
part_info.start = 0;
part_info.size = rbdd->lba;
part_info.blksz = rbdd->blksz;
} else {
if (get_partition_info (reiserfs_block_dev_desc, part, &part_info)) {
return 0;
}
}
return (part_info.size);
} }
@@ -59,7 +48,7 @@ int reiserfs_devread (int sector, int byte_offset, int byte_len, char *buf)
*/ */
if (sector < 0 if (sector < 0
|| ((sector + ((byte_offset + byte_len - 1) >> SECTOR_BITS)) || ((sector + ((byte_offset + byte_len - 1) >> SECTOR_BITS))
>= part_info.size)) { >= part_info->size)) {
/* errnum = ERR_OUTSIDE_PART; */ /* errnum = ERR_OUTSIDE_PART; */
printf (" ** reiserfs_devread() read outside partition\n"); printf (" ** reiserfs_devread() read outside partition\n");
return 0; return 0;
@@ -83,7 +72,8 @@ int reiserfs_devread (int sector, int byte_offset, int byte_len, char *buf)
if (byte_offset != 0) { if (byte_offset != 0) {
/* read first part which isn't aligned with start of sector */ /* read first part which isn't aligned with start of sector */
if (reiserfs_block_dev_desc->block_read(reiserfs_block_dev_desc->dev, if (reiserfs_block_dev_desc->block_read(reiserfs_block_dev_desc->dev,
part_info.start+sector, 1, (unsigned long *)sec_buf) != 1) { part_info->start + sector, 1,
(unsigned long *)sec_buf) != 1) {
printf (" ** reiserfs_devread() read error\n"); printf (" ** reiserfs_devread() read error\n");
return 0; return 0;
} }
@@ -96,8 +86,8 @@ int reiserfs_devread (int sector, int byte_offset, int byte_len, char *buf)
/* read sector aligned part */ /* read sector aligned part */
block_len = byte_len & ~(SECTOR_SIZE-1); block_len = byte_len & ~(SECTOR_SIZE-1);
if (reiserfs_block_dev_desc->block_read(reiserfs_block_dev_desc->dev, if (reiserfs_block_dev_desc->block_read(reiserfs_block_dev_desc->dev,
part_info.start+sector, block_len/SECTOR_SIZE, (unsigned long *)buf) != part_info->start + sector, block_len/SECTOR_SIZE,
block_len/SECTOR_SIZE) { (unsigned long *)buf) != block_len/SECTOR_SIZE) {
printf (" ** reiserfs_devread() read error - block\n"); printf (" ** reiserfs_devread() read error - block\n");
return 0; return 0;
} }
@@ -108,7 +98,8 @@ int reiserfs_devread (int sector, int byte_offset, int byte_len, char *buf)
if ( byte_len != 0 ) { if ( byte_len != 0 ) {
/* read rest of data which are not in whole sector */ /* read rest of data which are not in whole sector */
if (reiserfs_block_dev_desc->block_read(reiserfs_block_dev_desc->dev, if (reiserfs_block_dev_desc->block_read(reiserfs_block_dev_desc->dev,
part_info.start+sector, 1, (unsigned long *)sec_buf) != 1) { part_info->start + sector, 1,
(unsigned long *)sec_buf) != 1) {
printf (" ** reiserfs_devread() read error - last part\n"); printf (" ** reiserfs_devread() read error - last part\n");
return 0; return 0;
} }

2
include/reiserfs.h
View File

@@ -75,7 +75,7 @@ typedef enum
} reiserfs_error_t; } reiserfs_error_t;
extern int reiserfs_set_blk_dev(block_dev_desc_t *rbdd, int part); extern void reiserfs_set_blk_dev(block_dev_desc_t *rbdd, disk_partition_t *info);
extern int reiserfs_ls (char *dirname); extern int reiserfs_ls (char *dirname);
extern int reiserfs_open (char *filename); extern int reiserfs_open (char *filename);
extern int reiserfs_read (char *buf, unsigned len); extern int reiserfs_read (char *buf, unsigned len);