Mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2026-06-13 15:03:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

vbe: Use a block device instead of descriptor

Browse Source 
Pass a struct udevice instead of the descriptor structure, since this is
the native argument for blk_read()

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2025-01-15 18:27:04 -07:00
committed by Tom Rini
parent 20a1e83732
commit b407b3e7d4
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
boot/vbe_simple.c
View File

@@ -21,7 +21,7 @@
#include <u-boot/crc.h>
#include "vbe_simple.h"
static int simple_read_version(struct udevice *dev, struct blk_desc *desc,
static int simple_read_version(struct udevice *dev, struct udevice *blk,
u8 *buf, struct simple_state *state)
{
struct simple_priv *priv = dev_get_priv(dev);
@@ -35,7 +35,7 @@ static int simple_read_version(struct udevice *dev, struct blk_desc *desc,
return log_msg_ret("get", -EBADF);
start /= MMC_MAX_BLOCK_LEN;
if (blk_read(desc->bdev, start, 1, buf) != 1)
if (blk_read(blk, start, 1, buf) != 1)
return log_msg_ret("read", -EIO);
strlcpy(state->fw_version, buf, MAX_VERSION_LEN);
log_debug("version=%s\n", state->fw_version);
@@ -43,7 +43,7 @@ static int simple_read_version(struct udevice *dev, struct blk_desc *desc,
return 0;
}
static int simple_read_nvdata(struct udevice *dev, struct blk_desc *desc,
static int simple_read_nvdata(struct udevice *dev, struct udevice *blk,
u8 *buf, struct simple_state *state)
{
struct simple_priv *priv = dev_get_priv(dev);
@@ -59,7 +59,7 @@ static int simple_read_nvdata(struct udevice *dev, struct blk_desc *desc,
return log_msg_ret("get", -EBADF);
start /= MMC_MAX_BLOCK_LEN;
if (blk_read(desc->bdev, start, 1, buf) != 1)
if (blk_read(blk, start, 1, buf) != 1)
return log_msg_ret("read", -EIO);
nvd = (struct vbe_nvdata *)buf;
hdr_ver = (nvd->hdr & NVD_HDR_VER_MASK) >> NVD_HDR_VER_SHIFT;
@@ -85,6 +85,7 @@ int vbe_simple_read_state(struct udevice *dev, struct simple_state *state)
ALLOC_CACHE_ALIGN_BUFFER(u8, buf, MMC_MAX_BLOCK_LEN);
struct simple_priv *priv = dev_get_priv(dev);
struct blk_desc *desc;
struct udevice *blk;
char devname[16];
const char *end;
int devnum;
@@ -104,11 +105,12 @@ int vbe_simple_read_state(struct udevice *dev, struct simple_state *state)
if (!desc)
return log_msg_ret("get", -ENXIO);
ret = simple_read_version(dev, desc, buf, state);
blk = desc->bdev;
ret = simple_read_version(dev, blk, buf, state);
if (ret)
return log_msg_ret("ver", ret);
ret = simple_read_nvdata(dev, desc, buf, state);
ret = simple_read_nvdata(dev, blk, buf, state);
if (ret)
return log_msg_ret("nvd", ret);