libreboot
/
lbmk
1
0
Fork 0
Code Packages Projects Releases Activity

util/nvmutil: use gbe[] in word() and setword() 

this will make the code more flexible, if (when) i
add changes that allow multiple commands to be used
in a single run, on any given number of files
fsdg20230625
Leah Rowe 2023-01-27 20:13:15 +00:00
parent b1186968e8
commit 0f4852450c
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
util/nvmutil/nvmutil.c
View File

@ -46,7 +46,7 @@ void cmd_swap(void);
void cmd_copy(void); void cmd_copy(void);
int validChecksum(int partnum); int validChecksum(int partnum);
uint16_t word(int pos16, int partnum); uint16_t word(int pos16, int partnum);
void setWord(int pos16, int partnum, uint16_t val); void setWord(int pos16, int partnum, uint16_t val16);
void byteswap(uint8_t *byte); void byteswap(uint8_t *byte);
void writeGbeFile(int *fd, const char *filename); void writeGbeFile(int *fd, const char *filename);
@ -403,19 +403,21 @@ validChecksum(int partnum)
uint16_t uint16_t
word(int pos16, int partnum) word(int pos16, int partnum)
{ {
uint16_t val16 = ((uint16_t *) buf)[pos16 + (partnum << 11)]; uint8_t *nbuf = (uint8_t *) gbe[partnum];
if (!little_endian) uint16_t pos8 = pos16 << 1;
byteswap((uint8_t *) &val16); uint16_t val16 = nbuf[pos8 + 1];
val16 <<= 8;
return val16; return val16 |= nbuf[pos8];
} }
void void
setWord(int pos16, int partnum, uint16_t val) setWord(int pos16, int partnum, uint16_t val16)
{ {
((uint16_t *) buf)[pos16 + (partnum << 11)] = val; uint8_t *nbuf = (uint8_t *) gbe[partnum];
if (!little_endian) uint8_t val8[2] = {(uint8_t) (val16 & 0xff), (uint8_t) (val16 >> 8)};
byteswap(buf + (pos16 << 1) + (partnum << 12)); uint16_t pos8 = pos16 << 1;
nbuf[pos8] = val8[0];
nbuf[pos8 + 1] = val8[1];
gbeFileModified = 1; gbeFileModified = 1;
nvmPartModified[partnum] = 1; nvmPartModified[partnum] = 1;