浏览代码

[arm_compiler_v4/v5] define rt_packed as __packed #10553

cmbjxxiao 1 月之前
父节点
当前提交
37d902537c
共有 3 个文件被更改,包括 6 次插入5 次删除
  1. 3 2
      components/drivers/block/partitions/efi.h
  2. 2 2
      components/drivers/include/drivers/nvme.h
  3. 1 1
      include/rtcompiler.h

+ 3 - 2
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__

+ 2 - 2
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
 {

+ 1 - 1
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