Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions bsp/hc32/tools/sdk_dist.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ def dist_do_building(BSP_ROOT, dist_dir):
print("=> copy hc32 bsp library")
library_dir = os.path.join(dist_dir, 'libraries')
library_path = os.path.join(os.path.dirname(BSP_ROOT), 'libraries')
bsp_copy_files(os.path.join(library_path, rtconfig.BSP_LIBRARY_TYPE),
os.path.join(library_dir, rtconfig.BSP_LIBRARY_TYPE))
if rtconfig.BSP_LIBRARY_TYPE is not None:
bsp_copy_files(os.path.join(library_path, rtconfig.BSP_LIBRARY_TYPE),
os.path.join(library_dir, rtconfig.BSP_LIBRARY_TYPE))

print("=> copy bsp drivers")
bsp_copy_files(os.path.join(library_path, 'hc32_drivers'), os.path.join(library_dir, 'hc32_drivers'))
Expand Down
6 changes: 3 additions & 3 deletions components/drivers/block/partitions/efi.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@
#ifndef __UUID_H__
#define UUID_SIZE 16

typedef struct
typedef rt_packed(struct
{
rt_uint8_t b[UUID_SIZE];
} guid_t;
} guid_t);
#endif /* __UUID_H__ */

#ifndef __EFI_H__
typedef guid_t efi_guid_t rt_align(4);
typedef rt_packed(guid_t) efi_guid_t rt_align(4);

#define EFI_GUID(a, b, c, d...) (efi_guid_t) \
{{ \
Expand Down
4 changes: 2 additions & 2 deletions components/drivers/include/drivers/nvme.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion include/rtcompiler.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading