diff --git a/components/drivers/block/partitions/efi.h b/components/drivers/block/partitions/efi.h index 6a10ec884f4..10f0f584f35 100644 --- a/components/drivers/block/partitions/efi.h +++ b/components/drivers/block/partitions/efi.h @@ -30,10 +30,11 @@ #ifndef __UUID_H__ #define UUID_SIZE 16 -typedef struct +rt_packed(struct _guid_t { rt_uint8_t b[UUID_SIZE]; -} guid_t; +}); +typedef struct _guid_t guid_t; #endif /* __UUID_H__ */ #ifndef __EFI_H__ diff --git a/components/drivers/include/drivers/nvme.h b/components/drivers/include/drivers/nvme.h index 1eca5d9caa3..4df2c420f9e 100644 --- a/components/drivers/include/drivers/nvme.h +++ b/components/drivers/include/drivers/nvme.h @@ -717,12 +717,12 @@ enum RT_NVME_CTRL_CTRATT_UUID_LIST = 1 << 9, }; -struct rt_nvme_lba_format +rt_packed(struct rt_nvme_lba_format { rt_le16_t ms; /* Metadata size */ rt_uint8_t ds; /* Data size */ rt_uint8_t rp; /* Relative performance */ -}; +}); rt_packed(struct rt_nvme_id_ns { diff --git a/include/rtcompiler.h b/include/rtcompiler.h index 012c85cb608..27adcaef37e 100644 --- a/include/rtcompiler.h +++ b/include/rtcompiler.h @@ -19,7 +19,7 @@ #if __ARMCC_VERSION >= 6010050 #define rt_packed(declare) declare __attribute__((packed)) #else -#define rt_packed(declare) declare +#define rt_packed(declare) __packed declare #endif #define rt_weak __attribute__((weak)) #define rt_typeof __typeof