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

util/nvmutil: be clearer about GbE file sizes

Browse Source 
the partsize variable is also misleading, because it
refers to the full half of a file, which might be
bigger than 4KB. this variable name is a hangover
from when nvmutil only supported 8KB files.

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-03-06 22:34:15 +00:00
parent e273391792
commit a7d7f68a5c
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/nvmutil/nvmutil.c
+7 -5
View File
@@ -121,14 +121,13 @@ static const char *rname = NULL;
static uint8_t buf[GBE_FILE_SIZE]; /* 8KB */ static uint8_t buf[GBE_FILE_SIZE]; /* 8KB */
static uint16_t mac_buf[3]; static uint16_t mac_buf[3];
static off_t partsize; static off_t gbe_file_size;
static int gbe_flags; static int gbe_flags;
#ifndef HAVE_ARC4RANDOM #ifndef HAVE_ARC4RANDOM
static int rfd = -1; static int rfd = -1;
#endif #endif
static int gbe_fd = -1; static int gbe_fd = -1;
static struct stat gbe_st;
static size_t part; static size_t part;
static unsigned char invert; static unsigned char invert;
static unsigned char part_modified[2]; static unsigned char part_modified[2];
@@ -342,13 +341,16 @@ open_dev_urandom(void)
static void static void
open_gbe_file(void) open_gbe_file(void)
{ {
static struct stat gbe_st;
xopen(&gbe_fd, fname, gbe_flags, &gbe_st); xopen(&gbe_fd, fname, gbe_flags, &gbe_st);
switch(gbe_st.st_size) { gbe_file_size = gbe_st.st_size;
switch (gbe_file_size) {
case SIZE_8KB: case SIZE_8KB:
case SIZE_16KB: case SIZE_16KB:
case SIZE_128KB: case SIZE_128KB:
partsize = gbe_st.st_size >> 1;
break; break;
default: default:
err(ECANCELED, "File size must be 8KB, 16KB or 128KB"); err(ECANCELED, "File size must be 8KB, 16KB or 128KB");
@@ -841,7 +843,7 @@ static off_t
gbe_file_offset(size_t p, const char *f_op) gbe_file_offset(size_t p, const char *f_op)
{ {
return gbe_x_offset(p, f_op, "file", return gbe_x_offset(p, f_op, "file",
partsize, gbe_st.st_size); gbe_file_size >> 1, gbe_file_size);
} }
/* /*