diff options
| author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2024-04-03 11:03:52 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2024-04-03 14:25:33 +0200 |
| commit | 126a048039411b522e47ee4d3c067a7ae154cf3c (patch) | |
| tree | b1d319d19571322cb764505a0456799a1ad78f5a | |
| parent | b36842429b6aa4c31337ac97e27c8da6d62fba33 (diff) | |
| download | barebox-126a04803941.tar.gz barebox-126a04803941.tar.xz | |
mci: improve packing of struct mci
rca will be at least 4-byte aligned due to being after a 4-byte member.
It's only 2 byte long though and followed by another 4 byte member,
wasting 2 bytes. Fill those up with the two 1-byte bool members we have.
This includes a change of type for high_capacity: This is ok, because
only 0 or 1 are ever saved into it.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Link: https://lore.barebox.org/20240403090353.2976380-1-a.fatoum@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | include/mci.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/mci.h b/include/mci.h index 52bf84ecdb..5781fb8ea3 100644 --- a/include/mci.h +++ b/include/mci.h @@ -559,15 +559,14 @@ struct mci { struct mci_host *host; /**< the host for this card */ struct device dev; /**< the device for our disk (mcix) */ unsigned version; - bool sdio; /**< card is a SDIO card */ - /** != 0 when a high capacity card is connected (OCR -> OCR_HCS) */ - int high_capacity; unsigned card_caps; /**< Card's capabilities */ unsigned ocr; /**< card's "operation condition register" */ unsigned scr[2]; unsigned csd[4]; /**< card's "card specific data register" */ unsigned cid[4]; /**< card's "card identification register" */ unsigned short rca; /* FIXME */ + bool sdio; /**< card is a SDIO card */ + bool high_capacity; /**< high capacity card is connected (OCR -> OCR_HCS) */ unsigned tran_speed; /**< Maximum transfer speed */ /** currently used data block length for read accesses */ unsigned read_bl_len; |