coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-22 05:00:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

util/nvmutil: rename check_bound check_nvm_bound

Browse Source 
this makes the intent clearer, because we only want to
access the 128-byte nvm area here.

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-03-06 22:39:43 +00:00
parent a7d7f68a5c
commit 9b6f2a2f7e
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/nvmutil/nvmutil.c
+6 -6
View File
@@ -59,7 +59,7 @@ static void cmd_swap(void);
static int good_checksum(size_t partnum); static int good_checksum(size_t partnum);
static uint16_t word(size_t pos16, size_t part); static uint16_t word(size_t pos16, size_t part);
static void set_word(size_t pos16, size_t part, uint16_t val16); static void set_word(size_t pos16, size_t part, uint16_t val16);
static void check_bound(size_t pos16, size_t part); static void check_nvm_bound(size_t pos16, size_t part);
static void write_gbe_file(void); static void write_gbe_file(void);
static void write_gbe_file_part(size_t part); static void write_gbe_file_part(size_t part);
static off_t gbe_file_offset(size_t part, const char *f_op); static off_t gbe_file_offset(size_t part, const char *f_op);
@@ -759,7 +759,7 @@ word(size_t pos16, size_t p)
{ {
size_t pos; size_t pos;
check_bound(pos16, p); check_nvm_bound(pos16, p);
pos = (pos16 << 1) + (p * GBE_PART_SIZE); pos = (pos16 << 1) + (p * GBE_PART_SIZE);
return buf[pos] | (buf[pos + 1] << 8); return buf[pos] | (buf[pos + 1] << 8);
@@ -770,7 +770,7 @@ set_word(size_t pos16, size_t p, uint16_t val16)
{ {
size_t pos; size_t pos;
check_bound(pos16, p); check_nvm_bound(pos16, p);
pos = (pos16 << 1) + (p * GBE_PART_SIZE); pos = (pos16 << 1) + (p * GBE_PART_SIZE);
buf[pos] = (uint8_t)(val16 & 0xff); buf[pos] = (uint8_t)(val16 & 0xff);
@@ -780,7 +780,7 @@ set_word(size_t pos16, size_t p, uint16_t val16)
} }
static void static void
check_bound(size_t c, size_t p) check_nvm_bound(size_t c, size_t p)
{ {
/* /*
* NVM_SIZE assumed as the limit, because the * NVM_SIZE assumed as the limit, because the
@@ -789,7 +789,7 @@ check_bound(size_t c, size_t p)
* *
* The only exception is copy/swap, but these * The only exception is copy/swap, but these
* do not use word/set_word and therefore do * do not use word/set_word and therefore do
* not cause check_bound() to be called. * not cause check_nvm_bound() to be called.
* *
* TODO: * TODO:
* This should be adjusted in the future, if * This should be adjusted in the future, if
@@ -799,7 +799,7 @@ check_bound(size_t c, size_t p)
check_part_num(p); check_part_num(p);
if (c >= NVM_WORDS) if (c >= NVM_WORDS)
err(EINVAL, "check_bound: out of bounds %zu", c); err(EINVAL, "check_nvm_bound: out of bounds %zu", c);
} }
static void static void