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

util/nvmutil: minor code cleanup

Browse Source 
Make word() a macro, simplify err_if().

Could also make setWord() a macro if I forego certain
optimisations, but I'll leave it as-is.

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2023-06-01 06:58:30 +01:00
parent 8f1e6d792f
commit 1f54860401
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/nvmutil/nvmutil.c
+4 -12
View File
@@ -52,7 +52,6 @@ void cmd_brick(void);
void cmd_swap(void); 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);
void setWord(int pos16, int partnum, uint16_t val16); void setWord(int pos16, int partnum, uint16_t val16);
void byteswap(int n, int partnum); void byteswap(int n, int partnum);
void writeGbeFile(int *fd, const char *filename, size_t nw); void writeGbeFile(int *fd, const char *filename, size_t nw);
@@ -67,6 +66,8 @@ void err_if(int condition);
#define SIZE_4KB 0x1000 #define SIZE_4KB 0x1000
#define SIZE_8KB 0x2000 #define SIZE_8KB 0x2000
#define word(pos16, partnum) (buf16[pos16 + (partnum << 11)])
uint16_t buf16[SIZE_4KB]; uint16_t buf16[SIZE_4KB];
uint8_t *buf; uint8_t *buf;
size_t gbe[2]; size_t gbe[2];
@@ -322,12 +323,6 @@ validChecksum(int partnum)
return (errno = ECANCELED) & 0; return (errno = ECANCELED) & 0;
} }
uint16_t
word(int pos16, int partnum)
{
return buf16[pos16 + (partnum << 11)];
}
void void
setWord(int pos16, int partnum, uint16_t val16) setWord(int pos16, int partnum, uint16_t val16)
{ {
@@ -397,9 +392,6 @@ xunveil(const char *path, const char *permissions)
void void
err_if(int condition) err_if(int condition)
{ {
if (!condition) if (condition)
return; err(errno = errno ? errno : ECANCELED, NULL);
if (!errno)
errno = ECANCELED;
err(errno, NULL);
} }