From ce19d974018273c8f69d98b7139e7fef822cc02a Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Mon, 5 May 2014 10:40:11 -0600 Subject: [PATCH] ums: support block devices not MMC devices The USB Mass Storage function could equally well support a SATA device as support an MMC device. Update struct ums to contain a block device descriptor, not an MMC device descriptor. Cc: Lukasz Majewski Signed-off-by: Stephen Warren Acked-by: Przemyslaw Marczak --- board/samsung/common/ums.c | 7 ++++--- include/usb_mass_storage.h | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/board/samsung/common/ums.c b/board/samsung/common/ums.c index cebabe920a..ffe6368583 100644 --- a/board/samsung/common/ums.c +++ b/board/samsung/common/ums.c @@ -7,12 +7,13 @@ #include #include +#include #include static int ums_read_sector(struct ums *ums_dev, ulong start, lbaint_t blkcnt, void *buf) { - block_dev_desc_t *block_dev = &ums_dev->mmc->block_dev; + block_dev_desc_t *block_dev = ums_dev->block_dev; lbaint_t blkstart = start + ums_dev->start_sector; int dev_num = block_dev->dev; @@ -22,7 +23,7 @@ static int ums_read_sector(struct ums *ums_dev, static int ums_write_sector(struct ums *ums_dev, ulong start, lbaint_t blkcnt, const void *buf) { - block_dev_desc_t *block_dev = &ums_dev->mmc->block_dev; + block_dev_desc_t *block_dev = ums_dev->block_dev; lbaint_t blkstart = start + ums_dev->start_sector; int dev_num = block_dev->dev; @@ -45,7 +46,7 @@ static struct ums *ums_disk_init(struct mmc *mmc) return NULL; } - ums_dev.mmc = mmc; + ums_dev.block_dev = &mmc->block_dev; if (ums_end_sector <= mmc_end_sector) { ums_dev.start_sector = UMS_START_SECTOR; diff --git a/include/usb_mass_storage.h b/include/usb_mass_storage.h index ed460644c1..e3eb1ebb2e 100644 --- a/include/usb_mass_storage.h +++ b/include/usb_mass_storage.h @@ -9,7 +9,7 @@ #define __USB_MASS_STORAGE_H__ #define SECTOR_SIZE 0x200 -#include +#include #include #ifndef UMS_START_SECTOR @@ -31,7 +31,7 @@ struct ums { unsigned int start_sector; unsigned int num_sectors; const char *name; - struct mmc *mmc; + block_dev_desc_t *block_dev; }; extern struct ums *ums; -- 2.39.5