diff options
| author | Julius Werner <jwerner@chromium.org> | 2020-12-29 17:51:04 -0800 |
|---|---|---|
| committer | Julius Werner <jwerner@chromium.org> | 2021-03-08 22:31:16 +0000 |
| commit | 11075fc80e00186cb5b488e8e0fd280cd4e97823 (patch) | |
| tree | 37d2054276102cfdbc9da10bf74cba14d4bbbf54 /src/lib | |
| parent | 723e3b10afe40a8fff2fa85c6ec2e10852533425 (diff) | |
| download | coreboot-11075fc80e00186cb5b488e8e0fd280cd4e97823.tar.xz | |
cbfs: Move trivial wrappers to static inlines
The new CBFS API contains a couple of trivial wrappers that all just
call the same base functions with slightly different predetermined
arguments, and I'm planning to add several more of them as well. This
patch changes these functions to become static inlines, and reorganizes
the cbfs.h header a bit for better readability while I'm at it.
Signed-off-by: Julius Werner <jwerner@chromium.org>
Change-Id: If0170401b2a70c158691b6eb56c7e312553afad1
Reviewed-on: https://review.coreboot.org/c/coreboot/+/49331
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/cbfs.c | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/src/lib/cbfs.c b/src/lib/cbfs.c index be2ab72662..fa6c2e3021 100644 --- a/src/lib/cbfs.c +++ b/src/lib/cbfs.c @@ -90,7 +90,7 @@ int cbfs_boot_locate(struct cbfsf *fh, const char *name, uint32_t *type) return 0; } -static void *_cbfs_map(const char *name, size_t *size_out, bool force_ro) +void *_cbfs_map(const char *name, size_t *size_out, bool force_ro) { struct region_device rdev; union cbfs_mdata mdata; @@ -104,16 +104,6 @@ static void *_cbfs_map(const char *name, size_t *size_out, bool force_ro) return rdev_mmap_full(&rdev); } -void *cbfs_map(const char *name, size_t *size_out) -{ - return _cbfs_map(name, size_out, false); -} - -void *cbfs_ro_map(const char *name, size_t *size_out) -{ - return _cbfs_map(name, size_out, true); -} - int cbfs_unmap(void *mapping) { /* This works because munmap() only works on the root rdev and never cares about which @@ -307,7 +297,7 @@ void *cbfs_boot_map_optionrom_revision(uint16_t vendor, uint16_t device, uint8_t return cbfs_map(name, NULL); } -static size_t _cbfs_load(const char *name, void *buf, size_t buf_size, bool force_ro) +size_t _cbfs_load(const char *name, void *buf, size_t buf_size, bool force_ro) { struct region_device rdev; union cbfs_mdata mdata; @@ -328,16 +318,6 @@ static size_t _cbfs_load(const char *name, void *buf, size_t buf_size, bool forc buf, buf_size, compression); } -size_t cbfs_load(const char *name, void *buf, size_t buf_size) -{ - return _cbfs_load(name, buf, buf_size, false); -} - -size_t cbfs_ro_load(const char *name, void *buf, size_t buf_size) -{ - return _cbfs_load(name, buf, buf_size, true); -} - int cbfs_prog_stage_load(struct prog *pstage) { struct cbfs_stage stage; |