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

util/nvmutil: mild refactoring

fsdg20230625
Leah Rowe 2022-11-27 09:43:47 +00:00
parent 342e5abe5e
commit e8eee6dd8a
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
util/nvmutil/nvmutil.c
View File

@ -34,7 +34,7 @@
ssize_t readFromFile(int *fd, uint8_t *buf, const char *path, int flags, ssize_t readFromFile(int *fd, uint8_t *buf, const char *path, int flags,
size_t size); size_t size);
void setmac(const char *strMac); void cmd_setmac(const char *strMac);
uint8_t hextonum(char chs); uint8_t hextonum(char chs);
void cmd_dump(void); void cmd_dump(void);
void showmac(int partnum); void showmac(int partnum);
@ -115,7 +115,7 @@ main(int argc, char *argv[])
if (errno == 0) { if (errno == 0) {
if (strMac != NULL) if (strMac != NULL)
setmac(strMac); cmd_setmac(strMac);
else if (cmd != NULL) else if (cmd != NULL)
(*cmd)(); (*cmd)();
@ -130,27 +130,6 @@ nvmutil_exit:
return errno; return errno;
} }
void
writeGbeFile(int *fd, const char *filename)
{
int partnum;
errno = 0;
if (pwrite((*fd), gbe, SIZE_8KB, 0) == SIZE_8KB)
close((*fd));
if (errno != 0)
return;
for (partnum = 0; partnum < 2; partnum++) {
if (nvmPartModified[partnum])
printf("Part %d modified\n", partnum);
else
fprintf (stderr,
"Part %d NOT modified\n", partnum);
}
printf("File `%s` successfully modified\n", filename);
}
ssize_t ssize_t
readFromFile(int *fd, uint8_t *buf, const char *path, int flags, size_t size) readFromFile(int *fd, uint8_t *buf, const char *path, int flags, size_t size)
{ {
@ -175,7 +154,7 @@ readFromFile(int *fd, uint8_t *buf, const char *path, int flags, size_t size)
} }
void void
setmac(const char *strMac) cmd_setmac(const char *strMac)
{ {
uint8_t o, val8; uint8_t o, val8;
uint16_t val16; uint16_t val16;
@ -244,9 +223,9 @@ hextonum(char chs)
if (random > 15) { if (random > 15) {
close(macfd); close(macfd);
free(rmac); free(rmac);
random = 0;
rmac = NULL; rmac = NULL;
} else if (rmac == NULL) { }
if (rmac == NULL) {
random = 0; random = 0;
if ((rmac = (uint8_t *) malloc(12)) == NULL) if ((rmac = (uint8_t *) malloc(12)) == NULL)
err(1, NULL); err(1, NULL);
@ -423,3 +402,24 @@ byteswap(uint8_t *byte) {
byte[1] ^= byte[0]; byte[1] ^= byte[0];
byte[0] ^= byte[1]; byte[0] ^= byte[1];
} }
void
writeGbeFile(int *fd, const char *filename)
{
int partnum;
errno = 0;
if (pwrite((*fd), gbe, SIZE_8KB, 0) == SIZE_8KB)
close((*fd));
if (errno != 0)
return;
for (partnum = 0; partnum < 2; partnum++) {
if (nvmPartModified[partnum])
printf("Part %d modified\n", partnum);
else
fprintf (stderr,
"Part %d NOT modified\n", partnum);
}
printf("File `%s` successfully modified\n", filename);
}