Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ums: remove UMS_{NUM,START}_SECTORS + UMS_START_SECTOR

Browse source 
These values aren't set anywhere at present, and hence have no effect.
The concept of a single global offset/number of sectors to expose through
USB Mass Storage doesn't even make sense in the face of multiple storage
devices. Remove these defines to simplify the code.

Cc: Lukasz Majewski <l.majewski@samsung.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Przemyslaw Marczak <p.marczak@samsung.com>
This commit is contained in:
Stephen Warren 2014-05-05 10:40:12 -06:00 committed by Lukasz Majewski
parent ce19d97401
commit c2474d9c71
2 changed files with 2 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
board/samsung/common/ums.c
View file

@ -39,7 +39,6 @@ static struct ums ums_dev = {
static struct ums *ums_disk_init(struct mmc *mmc)
{
uint64_t mmc_end_sector = mmc->capacity / SECTOR_SIZE;
uint64_t ums_end_sector = UMS_NUM_SECTORS + UMS_START_SECTOR;
if (!mmc_end_sector) {
error("MMC capacity is not valid");
@ -47,17 +46,8 @@ static struct ums *ums_disk_init(struct mmc *mmc)
}
ums_dev.block_dev = &mmc->block_dev;
if (ums_end_sector <= mmc_end_sector) {
ums_dev.start_sector = UMS_START_SECTOR;
if (UMS_NUM_SECTORS)
ums_dev.num_sectors = UMS_NUM_SECTORS;
else
ums_dev.num_sectors = mmc_end_sector - UMS_START_SECTOR;
} else {
ums_dev.start_sector = 0;
ums_dev.num_sectors = mmc_end_sector;
puts("UMS: defined bad disk parameters. Using default.\n");
}
printf("UMS: disk start sector: %#x, count: %#x\n",
ums_dev.start_sector, ums_dev.num_sectors);

8
include/usb_mass_storage.h
View file

@ -12,14 +12,6 @@
#include <part.h>
#include <linux/usb/composite.h>
#ifndef UMS_START_SECTOR
#define UMS_START_SECTOR 0
#endif
#ifndef UMS_NUM_SECTORS
#define UMS_NUM_SECTORS 0
#endif
/* Wait at maximum 60 seconds for cable connection */
#define UMS_CABLE_READY_TIMEOUT 60