coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-11 05:52:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

util/nvmutil: tidy up set_mac_nib

Browse Source 
simplify it again

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-03-06 21:06:58 +00:00
parent 6b924787be
commit 040eee4607
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/nvmutil/nvmutil.c
+6 -9
View File
@@ -468,10 +468,7 @@ set_mac_nib(size_t mac_str_pos, size_t mac_nib_pos)
uint8_t mac_ch; uint8_t mac_ch;
size_t mac_byte_pos; size_t mac_byte_pos;
size_t mac_word_left_shift;
size_t mac_buf_word_pos;
size_t mac_buf_byte_pos;
size_t mac_buf_nib_pos;
if ((mac_ch = hextonum(mac_str[mac_str_pos + mac_nib_pos])) > 15) if ((mac_ch = hextonum(mac_str[mac_str_pos + mac_nib_pos])) > 15)
err(EINVAL, "Invalid character '%c'", err(EINVAL, "Invalid character '%c'",
@@ -496,15 +493,15 @@ set_mac_nib(size_t mac_str_pos, size_t mac_nib_pos)
* *
* Later code using the MAC string will handle this. * Later code using the MAC string will handle this.
*/ */
mac_buf_word_pos = mac_byte_pos >> 1; mac_word_left_shift =
mac_buf_byte_pos = (mac_byte_pos & 1) << 3; /* left or right byte? */ ((mac_byte_pos & 1) << 3) /* left or right byte? */
mac_buf_nib_pos = (mac_nib_pos ^ 1) << 2; /* left or right nib? */ | ((mac_nib_pos ^ 1) << 2); /* left or right nib? */
/* /*
* Now we can shift properly, OR'ing the result: * Now we can shift properly, OR'ing the result:
*/ */
mac_buf[mac_buf_word_pos] |= (uint16_t)mac_ch << mac_buf[mac_byte_pos >> 1] |=
(mac_buf_byte_pos | mac_buf_nib_pos); (uint16_t)mac_ch << mac_word_left_shift;
} }
static uint8_t static uint8_t