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

util/nvmutil: remove xorswap() macro 

it's only used once, so just do it once.

Signed-off-by: Leah Rowe <leah@libreboot.org>
btrfsvols
Leah Rowe 2023-09-19 16:28:08 +01:00
parent 231015ef89
commit 905f3d8e7b
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
util/nvmutil/nvmutil.c
View File

@ -65,7 +65,6 @@ void (*cmd)(void) = NULL;
if (fstat(f, &st) == -1) err(ERR(), "%s", l) if (fstat(f, &st) == -1) err(ERR(), "%s", l)
#define handle_endianness(r) if (((uint8_t *) &endian)[0] ^ 1) xorswap_buf(r) #define handle_endianness(r) if (((uint8_t *) &endian)[0] ^ 1) xorswap_buf(r)
#define xorswap(x, y) x ^= y, y ^= x, x ^= y
#define word(pos16, partnum) buf16[pos16 + (partnum << 11)] #define word(pos16, partnum) buf16[pos16 + (partnum << 11)]
#define setWord(pos16, p, val16) if ((gbeFileModified = 1) && \ #define setWord(pos16, p, val16) if ((gbeFileModified = 1) && \
word(pos16, p) != val16) nvmPartModified[p] = 1 | (word(pos16, p) = val16) word(pos16, p) != val16) nvmPartModified[p] = 1 | (word(pos16, p) = val16)
@ -264,9 +263,9 @@ validChecksum(int partnum)
void void
xorswap_buf(int partnum) xorswap_buf(int partnum)
{ {
uint8_t *nbuf = (uint8_t *) gbe[partnum]; uint8_t *n = (uint8_t *) gbe[partnum];
for (size_t w = 0; w < (nf >> 1); w++) for (size_t w = 0, x = 1; w < nf; w += 2, x += 2)
xorswap(nbuf[w << 1], nbuf[(w << 1) + 1]); n[w] ^= n[x], n[x] ^= n[w], n[w] ^= n[x];
} }
void void