@ -35,6 +35,7 @@
# include <linux/ctype.h>
# include <linux/ctype.h>
# include <asm/byteorder.h>
# include <asm/byteorder.h>
# include <reiserfs.h>
# include <reiserfs.h>
# include <part.h>
# ifndef CONFIG_DOS_PARTITION
# ifndef CONFIG_DOS_PARTITION
# error DOS partition support must be selected
# error DOS partition support must be selected
@ -48,41 +49,6 @@
# define PRINTF(fmt,args...)
# define PRINTF(fmt,args...)
# endif
# endif
static block_dev_desc_t * get_dev ( char * ifname , int dev )
{
# if (CONFIG_COMMANDS & CFG_CMD_IDE)
if ( strncmp ( ifname , " ide " , 3 ) = = 0 ) {
extern block_dev_desc_t * ide_get_dev ( int dev ) ;
return ( ( dev > = CFG_IDE_MAXDEVICE ) ? NULL : ide_get_dev ( dev ) ) ;
}
# endif
# if (CONFIG_COMMANDS & CFG_CMD_SCSI)
if ( strncmp ( ifname , " scsi " , 4 ) = = 0 ) {
extern block_dev_desc_t * scsi_get_dev ( int dev ) ;
return ( ( dev > = CFG_SCSI_MAXDEVICE ) ? NULL : scsi_get_dev ( dev ) ) ;
}
# endif
# if ((CONFIG_COMMANDS & CFG_CMD_USB) && defined(CONFIG_USB_STORAGE))
if ( strncmp ( ifname , " usb " , 3 ) = = 0 ) {
extern block_dev_desc_t * usb_stor_get_dev ( int dev ) ;
return ( ( dev > = USB_MAX_STOR_DEV ) ? NULL : usb_stor_get_dev ( dev ) ) ;
}
# endif
# if defined(CONFIG_MMC)
if ( strncmp ( ifname , " mmc " , 3 ) = = 0 ) {
extern block_dev_desc_t * mmc_get_dev ( int dev ) ;
return ( ( dev > = 1 ) ? NULL : mmc_get_dev ( dev ) ) ;
}
# endif
# if defined(CONFIG_SYSTEMACE)
if ( strcmp ( ifname , " ace " ) = = 0 ) {
extern block_dev_desc_t * systemace_get_dev ( int dev ) ;
return ( ( dev > = 1 ) ? NULL : systemace_get_dev ( dev ) ) ;
}
# endif
return NULL ;
}
int do_reiserls ( cmd_tbl_t * cmdtp , int flag , int argc , char * argv [ ] )
int do_reiserls ( cmd_tbl_t * cmdtp , int flag , int argc , char * argv [ ] )
{
{
char * filename = " / " ;
char * filename = " / " ;
@ -97,7 +63,7 @@ int do_reiserls (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
return 1 ;
return 1 ;
}
}
dev = ( int ) simple_strtoul ( argv [ 2 ] , & ep , 16 ) ;
dev = ( int ) simple_strtoul ( argv [ 2 ] , & ep , 16 ) ;
dev_desc = get_dev ( argv [ 1 ] , dev ) ;
dev_desc = get_dev ( argv [ 1 ] , dev ) ;
if ( dev_desc = = NULL ) {
if ( dev_desc = = NULL ) {
printf ( " \n ** Block device %s %d not supported \n " , argv [ 1 ] , dev ) ;
printf ( " \n ** Block device %s %d not supported \n " , argv [ 1 ] , dev ) ;
@ -196,7 +162,7 @@ int do_reiserload (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
}
}
dev = ( int ) simple_strtoul ( argv [ 2 ] , & ep , 16 ) ;
dev = ( int ) simple_strtoul ( argv [ 2 ] , & ep , 16 ) ;
dev_desc = get_dev ( argv [ 1 ] , dev ) ;
dev_desc = get_dev ( argv [ 1 ] , dev ) ;
if ( dev_desc = = NULL ) {
if ( dev_desc = = NULL ) {
printf ( " \n ** Block device %s %d not supported \n " , argv [ 1 ] , dev ) ;
printf ( " \n ** Block device %s %d not supported \n " , argv [ 1 ] , dev ) ;
return 1 ;
return 1 ;