leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

disk: Rename block functions

Browse Source 
Use the uclass type as the first part of the function name, to be
consistent with the methods in other block drivers.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2022-10-20 18:22:52 -06:00 committed by Tom Rini
parent b190deb895
commit 76c839fcb4
3 changed files with 52 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
disk/disk-uclass.c
View File

@ -65,7 +65,7 @@ int part_create_block_devices(struct udevice *blk_dev)
return 0;
}
static ulong blk_part_read(struct udevice *dev, lbaint_t start,
static ulong part_blk_read(struct udevice *dev, lbaint_t start,
lbaint_t blkcnt, void *buffer)
{
struct udevice *parent;
@ -88,7 +88,7 @@ static ulong blk_part_read(struct udevice *dev, lbaint_t start,
return ops->read(parent, start, blkcnt, buffer);
}
static ulong blk_part_write(struct udevice *dev, lbaint_t start,
static ulong part_blk_write(struct udevice *dev, lbaint_t start,
lbaint_t blkcnt, const void *buffer)
{
struct udevice *parent;
@ -111,7 +111,7 @@ static ulong blk_part_write(struct udevice *dev, lbaint_t start,
return ops->write(parent, start, blkcnt, buffer);
}
static ulong blk_part_erase(struct udevice *dev, lbaint_t start,
static ulong part_blk_erase(struct udevice *dev, lbaint_t start,
lbaint_t blkcnt)
{
struct udevice *parent;
@ -135,9 +135,9 @@ static ulong blk_part_erase(struct udevice *dev, lbaint_t start,
}
static const struct blk_ops blk_part_ops = {
.read = blk_part_read,
.write = blk_part_write,
.erase = blk_part_erase,
.read = part_blk_read,
.write = part_blk_write,
.erase = part_blk_erase,
};
U_BOOT_DRIVER(blk_partition) = {
@ -168,8 +168,8 @@ static struct blk_desc *dev_get_blk(struct udevice *dev)
return block_dev;
}
unsigned long dev_read(struct udevice *dev, lbaint_t start,
lbaint_t blkcnt, void *buffer)
unsigned long disk_blk_read(struct udevice *dev, lbaint_t start,
lbaint_t blkcnt, void *buffer)
{
struct blk_desc *block_dev;
const struct blk_ops *ops;
@ -202,8 +202,8 @@ unsigned long dev_read(struct udevice *dev, lbaint_t start,
return blks_read;
}
unsigned long dev_write(struct udevice *dev, lbaint_t start,
lbaint_t blkcnt, const void *buffer)
unsigned long disk_blk_write(struct udevice *dev, lbaint_t start,
lbaint_t blkcnt, const void *buffer)
{
struct blk_desc *block_dev;
const struct blk_ops *ops;
@ -221,8 +221,8 @@ unsigned long dev_write(struct udevice *dev, lbaint_t start,
return ops->write(dev, start, blkcnt, buffer);
}
unsigned long dev_erase(struct udevice *dev, lbaint_t start,
lbaint_t blkcnt)
unsigned long disk_blk_erase(struct udevice *dev, lbaint_t start,
lbaint_t blkcnt)
{
struct blk_desc *block_dev;
const struct blk_ops *ops;

42
include/part.h
View File

@ -313,12 +313,42 @@ struct udevice;
*/
int part_create_block_devices(struct udevice *blk_dev);
unsigned long dev_read(struct udevice *dev, lbaint_t start,
lbaint_t blkcnt, void *buffer);
unsigned long dev_write(struct udevice *dev, lbaint_t start,
lbaint_t blkcnt, const void *buffer);
unsigned long dev_erase(struct udevice *dev, lbaint_t start,
lbaint_t blkcnt);
/**
* disk_blk_read() - read blocks from a disk partition
*
* @dev: Device to read from (UCLASS_PARTITION)
* @start: Start block number to read in the partition (0=first)
* @blkcnt: Number of blocks to read
* @buffer: Destination buffer for data read
* Returns: number of blocks read, or -ve error number (see the
* IS_ERR_VALUE() macro
*/
ulong disk_blk_read(struct udevice *dev, lbaint_t start, lbaint_t blkcnt,
void *buffer);
/**
* disk_blk_write() - write to a disk partition
*
* @dev: Device to write to (UCLASS_PARTITION)
* @start: Start block number to write in the partition (0=first)
* @blkcnt: Number of blocks to write
* @buffer: Source buffer for data to write
* Returns: number of blocks written, or -ve error number (see the
* IS_ERR_VALUE() macro
*/
ulong disk_blk_write(struct udevice *dev, lbaint_t start, lbaint_t blkcnt,
const void *buffer);
/**
* disk_blk_erase() - erase a section of a disk partition
*
* @dev: Device to (partially) erase (UCLASS_PARTITION)
* @start: Start block number to erase in the partition (0=first)
* @blkcnt: Number of blocks to erase
* Returns: number of blocks erased, or -ve error number (see the
* IS_ERR_VALUE() macro
*/
ulong disk_blk_erase(struct udevice *dev, lbaint_t start, lbaint_t blkcnt);
/*
* We don't support printing partition information in SPL and only support

6
lib/efi_loader/efi_disk.c
View File

@ -123,9 +123,11 @@ static efi_status_t efi_disk_rw_blocks(struct efi_block_io *this,
if (CONFIG_IS_ENABLED(PARTITIONS) &&
device_get_uclass_id(diskobj->header.dev) == UCLASS_PARTITION) {
if (direction == EFI_DISK_READ)
n = dev_read(diskobj->header.dev, lba, blocks, buffer);
n = disk_blk_read(diskobj->header.dev, lba, blocks,
buffer);
else
n = dev_write(diskobj->header.dev, lba, blocks, buffer);
n = disk_blk_write(diskobj->header.dev, lba, blocks,
buffer);
} else {
/* dev is a block device (UCLASS_BLK) */
struct blk_desc *desc;