summaryrefslogtreecommitdiff
path: root/components
diff options
context:
space:
mode:
authorMan, Jianting (Meco) <[email protected]>2022-12-11 13:12:03 -0500
committerGitHub <[email protected]>2022-12-11 13:12:03 -0500
commit99bdf978d7fe4ec18ed50a639e15b254825c871b (patch)
tree51ffb6f5fae10f2ce9a6baf4b861c025b8056fb6 /components
parenta4b8762d8584b02a9b1f1c675a97ecaa105144be (diff)
[rtdef] use lower-case to define attributes (#6728)
* [rtdef] rename RT_WEAK attribute as rt_weak * [rtdef] rename RT_USED attribute as rt_used * [rtdef] rename RT_SECTION attribute as rt_section * [rtdef] rename ALIGN attribute as rt_align * [legacy] add RT_USED ALIGN RT_SECTION RT_WEAK as legacy support
Diffstat (limited to 'components')
-rw-r--r--components/dfs/filesystems/romfs/romfs.c4
-rw-r--r--components/drivers/pm/pm.c8
-rw-r--r--components/drivers/spi/spi_wifi_rw009.c6
-rw-r--r--components/drivers/usb/usbdevice/class/audio_mic.c12
-rw-r--r--components/drivers/usb/usbdevice/class/audio_speaker.c12
-rw-r--r--components/drivers/usb/usbdevice/class/cdc_vcom.c16
-rw-r--r--components/drivers/usb/usbdevice/class/ecm.c18
-rw-r--r--components/drivers/usb/usbdevice/class/hid.c14
-rw-r--r--components/drivers/usb/usbdevice/class/mstorage.c10
-rw-r--r--components/drivers/usb/usbdevice/class/rndis.c22
-rw-r--r--components/drivers/usb/usbdevice/class/winusb.c12
-rw-r--r--components/drivers/usb/usbdevice/core/usbdevice_core.c2
-rw-r--r--components/finsh/finsh.h10
-rw-r--r--components/finsh/shell.c2
-rw-r--r--components/legacy/rtlegacy.h12
-rw-r--r--components/libc/compilers/armlibc/syscalls.c2
-rw-r--r--components/libc/compilers/common/ctime.c8
-rw-r--r--components/libc/cplusplus/cxx_crt_init.c10
-rw-r--r--components/lwp/lwp.c2
-rw-r--r--components/lwp/lwp_avl.c2
-rw-r--r--components/lwp/lwp_syscall.c6
-rw-r--r--components/lwp/page.c4
-rw-r--r--components/net/at/include/at.h2
-rw-r--r--components/net/at/src/at_server.c4
-rw-r--r--components/net/at/src/at_utils.c2
-rw-r--r--components/net/lwip/port/sys_arch.c2
-rw-r--r--components/net/netdev/src/netdev_ipaddr.c2
-rw-r--r--components/utilities/ulog/syslog/syslog.c2
-rw-r--r--components/utilities/ulog/ulog.c8
-rw-r--r--components/utilities/utest/utest.h4
-rw-r--r--components/utilities/var_export/var_export.c12
-rw-r--r--components/utilities/var_export/var_export.h22
-rw-r--r--components/vmm/vmm.c6
-rw-r--r--components/vmm/vmm_context.c8
34 files changed, 139 insertions, 129 deletions
diff --git a/components/dfs/filesystems/romfs/romfs.c b/components/dfs/filesystems/romfs/romfs.c
index 6897c23d5c..0ca17766c8 100644
--- a/components/dfs/filesystems/romfs/romfs.c
+++ b/components/dfs/filesystems/romfs/romfs.c
@@ -25,13 +25,13 @@ static const unsigned char _dummy_txt[] =
0x74, 0x68, 0x69, 0x73, 0x20, 0x69, 0x73, 0x20, 0x61, 0x20, 0x66, 0x69, 0x6c, 0x65, 0x21, 0x0d, 0x0a,
};
-RT_WEAK const struct romfs_dirent _root_dirent[] =
+rt_weak const struct romfs_dirent _root_dirent[] =
{
{ROMFS_DIRENT_DIR, "dummy", (rt_uint8_t *)_dummy, sizeof(_dummy) / sizeof(_dummy[0])},
{ROMFS_DIRENT_FILE, "dummy.txt", _dummy_txt, sizeof(_dummy_txt)},
};
-RT_WEAK const struct romfs_dirent romfs_root =
+rt_weak const struct romfs_dirent romfs_root =
{
ROMFS_DIRENT_DIR, "/", (rt_uint8_t *)_root_dirent, sizeof(_root_dirent) / sizeof(_root_dirent[0])
};
diff --git a/components/drivers/pm/pm.c b/components/drivers/pm/pm.c
index b4dee11e41..0c6dcf065d 100644
--- a/components/drivers/pm/pm.c
+++ b/components/drivers/pm/pm.c
@@ -64,12 +64,12 @@ static rt_uint8_t _pm_default_deepsleep = RT_PM_DEFAULT_DEEPSLEEP_MODE;
static struct rt_pm_notify _pm_notify;
static rt_uint8_t _pm_init_flag = 0;
-RT_WEAK rt_uint32_t rt_pm_enter_critical(rt_uint8_t sleep_mode)
+rt_weak rt_uint32_t rt_pm_enter_critical(rt_uint8_t sleep_mode)
{
return rt_hw_interrupt_disable();
}
-RT_WEAK void rt_pm_exit_critical(rt_uint32_t ctx, rt_uint8_t sleep_mode)
+rt_weak void rt_pm_exit_critical(rt_uint32_t ctx, rt_uint8_t sleep_mode)
{
rt_hw_interrupt_enable(ctx);
}
@@ -288,7 +288,7 @@ static rt_bool_t _pm_device_check_idle(void)
return RT_TRUE;
}
-RT_WEAK rt_tick_t pm_timer_next_timeout_tick(rt_uint8_t mode)
+rt_weak rt_tick_t pm_timer_next_timeout_tick(rt_uint8_t mode)
{
switch (mode)
{
@@ -310,7 +310,7 @@ RT_WEAK rt_tick_t pm_timer_next_timeout_tick(rt_uint8_t mode)
*
* @return none
*/
-RT_WEAK rt_uint8_t pm_get_sleep_threshold_mode(rt_uint8_t cur_mode, rt_tick_t timeout_tick)
+rt_weak rt_uint8_t pm_get_sleep_threshold_mode(rt_uint8_t cur_mode, rt_tick_t timeout_tick)
{
rt_uint8_t sleep_mode = cur_mode;
diff --git a/components/drivers/spi/spi_wifi_rw009.c b/components/drivers/spi/spi_wifi_rw009.c
index 20dd6d7f93..39388f10c4 100644
--- a/components/drivers/spi/spi_wifi_rw009.c
+++ b/components/drivers/spi/spi_wifi_rw009.c
@@ -68,12 +68,12 @@ struct rw009_wifi
struct rt_mailbox rw009_cmd_mb;
uint32_t last_cmd;
- ALIGN(4)
+ rt_align(4)
rt_uint8_t spi_tx_mempool[(sizeof(struct spi_data_packet) + 4) * SPI_TX_POOL_SIZE];
- ALIGN(4)
+ rt_align(4)
rt_uint8_t spi_rx_mempool[(sizeof(struct spi_data_packet) + 4) * SPI_RX_POOL_SIZE];
- ALIGN(4)
+ rt_align(4)
uint8_t spi_hw_rx_buffer[MAX_SPI_BUFFER_SIZE];
/* status for RW009 */
diff --git a/components/drivers/usb/usbdevice/class/audio_mic.c b/components/drivers/usb/usbdevice/class/audio_mic.c
index 81170b8a72..afedf2ef2d 100644
--- a/components/drivers/usb/usbdevice/class/audio_mic.c
+++ b/components/drivers/usb/usbdevice/class/audio_mic.c
@@ -88,7 +88,7 @@ struct uac_audio_mic
};
static struct uac_audio_mic mic;
-ALIGN(4)
+rt_align(4)
static struct udevice_descriptor dev_desc =
{
USB_DESC_LENGTH_DEVICE, //bLength;
@@ -108,7 +108,7 @@ static struct udevice_descriptor dev_desc =
};
//FS and HS needed
-ALIGN(4)
+rt_align(4)
static struct usb_qualifier_descriptor dev_qualifier =
{
sizeof(dev_qualifier), //bLength
@@ -122,7 +122,7 @@ static struct usb_qualifier_descriptor dev_qualifier =
0,
};
-ALIGN(4)
+rt_align(4)
const static char *_ustring[] =
{
"Language",
@@ -133,7 +133,7 @@ const static char *_ustring[] =
"Interface",
};
-ALIGN(4)
+rt_align(4)
static struct uac_ac_descriptor ac_desc =
{
#ifdef RT_USB_DEVICE_COMPOSITE
@@ -214,7 +214,7 @@ static struct uac_ac_descriptor ac_desc =
#endif
};
-ALIGN(4)
+rt_align(4)
static struct uinterface_descriptor as_desc0 =
{
USB_DESC_LENGTH_INTERFACE,
@@ -228,7 +228,7 @@ static struct uinterface_descriptor as_desc0 =
0x00,
};
-ALIGN(4)
+rt_align(4)
static struct uac_as_descriptor as_desc =
{
/* Interface Descriptor */
diff --git a/components/drivers/usb/usbdevice/class/audio_speaker.c b/components/drivers/usb/usbdevice/class/audio_speaker.c
index 6148478c02..67da8105e4 100644
--- a/components/drivers/usb/usbdevice/class/audio_speaker.c
+++ b/components/drivers/usb/usbdevice/class/audio_speaker.c
@@ -89,7 +89,7 @@ struct uac_audio_speaker
};
static struct uac_audio_speaker speaker;
-ALIGN(4)
+rt_align(4)
static struct udevice_descriptor dev_desc =
{
USB_DESC_LENGTH_DEVICE, //bLength;
@@ -109,7 +109,7 @@ static struct udevice_descriptor dev_desc =
};
//FS and HS needed
-ALIGN(4)
+rt_align(4)
static struct usb_qualifier_descriptor dev_qualifier =
{
sizeof(dev_qualifier), //bLength
@@ -123,7 +123,7 @@ static struct usb_qualifier_descriptor dev_qualifier =
0,
};
-ALIGN(4)
+rt_align(4)
const static char *_ustring[] =
{
"Language",
@@ -134,7 +134,7 @@ const static char *_ustring[] =
"Interface",
};
-ALIGN(4)
+rt_align(4)
static struct uac_ac_descriptor ac_desc =
{
#ifdef RT_USB_DEVICE_COMPOSITE
@@ -214,7 +214,7 @@ static struct uac_ac_descriptor ac_desc =
#endif
};
-ALIGN(4)
+rt_align(4)
static struct uinterface_descriptor as_desc0 =
{
USB_DESC_LENGTH_INTERFACE,
@@ -228,7 +228,7 @@ static struct uinterface_descriptor as_desc0 =
0x00,
};
-ALIGN(4)
+rt_align(4)
static struct uac_as_descriptor as_desc =
{
/* Interface Descriptor */
diff --git a/components/drivers/usb/usbdevice/class/cdc_vcom.c b/components/drivers/usb/usbdevice/class/cdc_vcom.c
index 91b49d47de..8eacd9248d 100644
--- a/components/drivers/usb/usbdevice/class/cdc_vcom.c
+++ b/components/drivers/usb/usbdevice/class/cdc_vcom.c
@@ -57,7 +57,7 @@
#define _SER_NO_LEN 14 /*rt_strlen("32021919830108")*/
#endif /*RT_VCOM_SER_LEN*/
-ALIGN(RT_ALIGN_SIZE)
+rt_align(RT_ALIGN_SIZE)
static rt_uint8_t vcom_thread_stack[VCOM_TASK_STK_SIZE];
static struct rt_thread vcom_thread;
static struct ucdc_line_coding line_coding;
@@ -91,7 +91,7 @@ struct vcom_tx_msg
rt_size_t size;
};
-ALIGN(4)
+rt_align(4)
static struct udevice_descriptor dev_desc =
{
USB_DESC_LENGTH_DEVICE, //bLength;
@@ -111,7 +111,7 @@ static struct udevice_descriptor dev_desc =
};
//FS and HS needed
-ALIGN(4)
+rt_align(4)
static struct usb_qualifier_descriptor dev_qualifier =
{
sizeof(dev_qualifier), //bLength
@@ -126,7 +126,7 @@ static struct usb_qualifier_descriptor dev_qualifier =
};
/* communcation interface descriptor */
-ALIGN(4)
+rt_align(4)
const static struct ucdc_comm_descriptor _comm_desc =
{
#ifdef RT_USB_DEVICE_COMPOSITE
@@ -200,7 +200,7 @@ const static struct ucdc_comm_descriptor _comm_desc =
};
/* data interface descriptor */
-ALIGN(4)
+rt_align(4)
const static struct ucdc_data_descriptor _data_desc =
{
/* interface descriptor */
@@ -234,15 +234,15 @@ const static struct ucdc_data_descriptor _data_desc =
0x00,
},
};
-ALIGN(4)
+rt_align(4)
static char serno[_SER_NO_LEN + 1] = {'\0'};
-RT_WEAK rt_err_t vcom_get_stored_serno(char *serno, int size);
+rt_weak rt_err_t vcom_get_stored_serno(char *serno, int size);
rt_err_t vcom_get_stored_serno(char *serno, int size)
{
return RT_ERROR;
}
-ALIGN(4)
+rt_align(4)
const static char* _ustring[] =
{
"Language",
diff --git a/components/drivers/usb/usbdevice/class/ecm.c b/components/drivers/usb/usbdevice/class/ecm.c
index 575da357e5..4f41c00531 100644
--- a/components/drivers/usb/usbdevice/class/ecm.c
+++ b/components/drivers/usb/usbdevice/class/ecm.c
@@ -36,13 +36,13 @@ struct rt_ecm_eth
rt_uint8_t host_addr[MAX_ADDR_LEN];
rt_uint8_t dev_addr[MAX_ADDR_LEN];
- ALIGN(4)
+ rt_align(4)
rt_uint8_t rx_pool[512];
- ALIGN(4)
+ rt_align(4)
rt_size_t rx_size;
- ALIGN(4)
+ rt_align(4)
rt_size_t rx_offset;
- ALIGN(4)
+ rt_align(4)
char rx_buffer[USB_ETH_MTU];
char tx_buffer[USB_ETH_MTU];
@@ -51,7 +51,7 @@ struct rt_ecm_eth
};
typedef struct rt_ecm_eth * rt_ecm_eth_t;
-ALIGN(4)
+rt_align(4)
static struct udevice_descriptor _dev_desc =
{
USB_DESC_LENGTH_DEVICE, /* bLength */
@@ -71,7 +71,7 @@ static struct udevice_descriptor _dev_desc =
};
/* communcation interface descriptor */
-ALIGN(4)
+rt_align(4)
const static struct ucdc_eth_descriptor _comm_desc =
{
#ifdef RT_USB_DEVICE_COMPOSITE
@@ -141,7 +141,7 @@ const static struct ucdc_eth_descriptor _comm_desc =
};
/* data interface descriptor */
-ALIGN(4)
+rt_align(4)
const static struct ucdc_data_descriptor _data_desc =
{
/* interface descriptor */
@@ -176,7 +176,7 @@ const static struct ucdc_data_descriptor _data_desc =
},
};
-ALIGN(4)
+rt_align(4)
const static char* _ustring[] =
{
"Language", /* LANGID */
@@ -187,7 +187,7 @@ const static char* _ustring[] =
"Interface", /* INTERFACE */
};
-ALIGN(4)
+rt_align(4)
//FS and HS needed
static struct usb_qualifier_descriptor dev_qualifier =
{
diff --git a/components/drivers/usb/usbdevice/class/hid.c b/components/drivers/usb/usbdevice/class/hid.c
index aa8877e471..a95e1d82e5 100644
--- a/components/drivers/usb/usbdevice/class/hid.c
+++ b/components/drivers/usb/usbdevice/class/hid.c
@@ -31,7 +31,7 @@ struct hid_s
};
/* CustomHID_ConfigDescriptor */
-ALIGN(4)
+rt_align(4)
const rt_uint8_t _report_desc[]=
{
#ifdef RT_USB_DEVICE_HID_KEYBOARD
@@ -236,7 +236,7 @@ const rt_uint8_t _report_desc[]=
#endif
}; /* CustomHID_ReportDescriptor */
-ALIGN(4)
+rt_align(4)
static struct udevice_descriptor _dev_desc =
{
USB_DESC_LENGTH_DEVICE, //bLength;
@@ -256,7 +256,7 @@ static struct udevice_descriptor _dev_desc =
};
//FS and HS needed
-ALIGN(4)
+rt_align(4)
static struct usb_qualifier_descriptor dev_qualifier =
{
sizeof(dev_qualifier), //bLength
@@ -272,7 +272,7 @@ static struct usb_qualifier_descriptor dev_qualifier =
/* hid interface descriptor */
-ALIGN(4)
+rt_align(4)
const static struct uhid_comm_descriptor _hid_comm_desc =
{
#ifdef RT_USB_DEVICE_COMPOSITE
@@ -361,7 +361,7 @@ const static struct uhid_comm_descriptor _hid_comm_desc =
},
};
-ALIGN(4)
+rt_align(4)
const static char* _ustring[] =
{
"Language",
@@ -612,11 +612,11 @@ static rt_size_t _hid_write(rt_device_t dev, rt_off_t pos, const void *buffer, r
return 0;
}
-RT_WEAK void HID_Report_Received(hid_report_t report)
+rt_weak void HID_Report_Received(hid_report_t report)
{
dump_report(report);
}
-ALIGN(RT_ALIGN_SIZE)
+rt_align(RT_ALIGN_SIZE)
static rt_uint8_t hid_thread_stack[512];
static struct rt_thread hid_thread;
diff --git a/components/drivers/usb/usbdevice/class/mstorage.c b/components/drivers/usb/usbdevice/class/mstorage.c
index 97a189834b..b8f21a29df 100644
--- a/components/drivers/usb/usbdevice/class/mstorage.c
+++ b/components/drivers/usb/usbdevice/class/mstorage.c
@@ -71,7 +71,7 @@ struct mstorage
struct rt_device_blk_geometry geometry;
};
-ALIGN(4)
+rt_align(4)
static struct udevice_descriptor dev_desc =
{
USB_DESC_LENGTH_DEVICE, //bLength;
@@ -91,7 +91,7 @@ static struct udevice_descriptor dev_desc =
};
//FS and HS needed
-ALIGN(4)
+rt_align(4)
static struct usb_qualifier_descriptor dev_qualifier =
{
sizeof(dev_qualifier), //bLength
@@ -106,7 +106,7 @@ static struct usb_qualifier_descriptor dev_qualifier =
};
-ALIGN(4)
+rt_align(4)
const static struct umass_descriptor _mass_desc =
{
#ifdef RT_USB_DEVICE_COMPOSITE
@@ -157,7 +157,7 @@ const static struct umass_descriptor _mass_desc =
},
};
-ALIGN(4)
+rt_align(4)
const static char* _ustring[] =
{
"Language",
@@ -180,7 +180,7 @@ static rt_size_t _read_10(ufunction_t func, ustorage_cbw_t cbw);
static rt_size_t _write_10(ufunction_t func, ustorage_cbw_t cbw);
static rt_size_t _verify_10(ufunction_t func, ustorage_cbw_t cbw);
-ALIGN(4)
+rt_align(4)
static struct scsi_cmd cmd_data[] =
{
{SCSI_TEST_UNIT_READY, _test_unit_ready, 6, FIXED, 0, DIR_NONE},
diff --git a/components/drivers/usb/usbdevice/class/rndis.c b/components/drivers/usb/usbdevice/class/rndis.c
index 69ca3f5d69..425ff62ee1 100644
--- a/components/drivers/usb/usbdevice/class/rndis.c
+++ b/components/drivers/usb/usbdevice/class/rndis.c
@@ -53,20 +53,20 @@ struct rt_rndis_eth
struct rt_timer timer;
#endif /* RNDIS_DELAY_LINK_UP */
- ALIGN(4)
+ rt_align(4)
rt_uint8_t rx_pool[512];
- ALIGN(4)
+ rt_align(4)
rt_uint8_t tx_pool[512];
rt_uint32_t cmd_pool[2];
- ALIGN(4)
+ rt_align(4)
char rx_buffer[sizeof(struct rndis_packet_msg) + USB_ETH_MTU + 14];
rt_size_t rx_offset;
rt_size_t rx_length;
rt_bool_t rx_flag;
rt_bool_t rx_frist;
- ALIGN(4)
+ rt_align(4)
char tx_buffer[sizeof(struct rndis_packet_msg) + USB_ETH_MTU + 14];
struct rt_semaphore tx_buffer_free;
@@ -77,7 +77,7 @@ struct rt_rndis_eth
typedef struct rt_rndis_eth * rt_rndis_eth_t;
static rt_uint32_t oid_packet_filter = 0x0000000;
-ALIGN(4)
+rt_align(4)
static struct udevice_descriptor _dev_desc =
{
USB_DESC_LENGTH_DEVICE, /* bLength */
@@ -97,7 +97,7 @@ static struct udevice_descriptor _dev_desc =
};
/* communcation interface descriptor */
-ALIGN(4)
+rt_align(4)
const static struct ucdc_comm_descriptor _comm_desc =
{
#ifdef RT_USB_DEVICE_COMPOSITE
@@ -171,7 +171,7 @@ const static struct ucdc_comm_descriptor _comm_desc =
};
/* data interface descriptor */
-ALIGN(4)
+rt_align(4)
const static struct ucdc_data_descriptor _data_desc =
{
/* interface descriptor */
@@ -206,7 +206,7 @@ const static struct ucdc_data_descriptor _data_desc =
},
};
-ALIGN(4)
+rt_align(4)
const static char* _ustring[] =
{
"Language", /* LANGID */
@@ -218,7 +218,7 @@ const static char* _ustring[] =
USB_STRING_OS
};
-ALIGN(4)
+rt_align(4)
struct usb_os_function_comp_id_descriptor rndis_func_comp_id_desc =
{
.bFirstInterfaceNumber = USB_DYNAMIC,
@@ -229,7 +229,7 @@ struct usb_os_function_comp_id_descriptor rndis_func_comp_id_desc =
};
//FS and HS needed
-ALIGN(4)
+rt_align(4)
static struct usb_qualifier_descriptor dev_qualifier =
{
sizeof(dev_qualifier), //bLength
@@ -244,7 +244,7 @@ static struct usb_qualifier_descriptor dev_qualifier =
};
/* supported OIDs */
-ALIGN(4)
+rt_align(4)
const static rt_uint32_t oid_supported_list[] =
{
/* General OIDs */
diff --git a/components/drivers/usb/usbdevice/class/winusb.c b/components/drivers/usb/usbdevice/class/winusb.c
index b5a169d2cb..4e534399be 100644
--- a/components/drivers/usb/usbdevice/class/winusb.c
+++ b/components/drivers/usb/usbdevice/class/winusb.c
@@ -22,7 +22,7 @@ struct winusb_device
#define WINUSB_INTF_STR_INDEX 13
typedef struct winusb_device * winusb_device_t;
-ALIGN(4)
+rt_align(4)
static struct udevice_descriptor dev_desc =
{
USB_DESC_LENGTH_DEVICE, //bLength;
@@ -42,7 +42,7 @@ static struct udevice_descriptor dev_desc =
};
//FS and HS needed
-ALIGN(4)
+rt_align(4)
static struct usb_qualifier_descriptor dev_qualifier =
{
sizeof(dev_qualifier), //bLength
@@ -56,7 +56,7 @@ static struct usb_qualifier_descriptor dev_qualifier =
0,
};
-ALIGN(4)
+rt_align(4)
struct winusb_descriptor _winusb_desc =
{
#ifdef RT_USB_DEVICE_COMPOSITE
@@ -108,7 +108,7 @@ struct winusb_descriptor _winusb_desc =
},
};
-ALIGN(4)
+rt_align(4)
const static char* _ustring[] =
{
"Language",
@@ -120,13 +120,13 @@ const static char* _ustring[] =
USB_STRING_OS//must be
};
-ALIGN(4)
+rt_align(4)
struct usb_os_proerty winusb_proerty[] =
{
USB_OS_PROPERTY_DESC(USB_OS_PROPERTY_TYPE_REG_SZ,"DeviceInterfaceGUID",RT_WINUSB_GUID),
};
-ALIGN(4)
+rt_align(4)
struct usb_os_function_comp_id_descriptor winusb_func_comp_id_desc =
{
.bFirstInterfaceNumber = USB_DYNAMIC,
diff --git a/components/drivers/usb/usbdevice/core/usbdevice_core.c b/components/drivers/usb/usbdevice/core/usbdevice_core.c
index 7b3a3ff67d..58d7170012 100644
--- a/components/drivers/usb/usbdevice/core/usbdevice_core.c
+++ b/components/drivers/usb/usbdevice/core/usbdevice_core.c
@@ -2225,7 +2225,7 @@ rt_err_t rt_usbd_event_signal(struct udev_msg* msg)
}
-ALIGN(RT_ALIGN_SIZE)
+rt_align(RT_ALIGN_SIZE)
static rt_uint8_t usb_thread_stack[RT_USBD_THREAD_STACK_SZ];
static struct rt_thread usb_thread;
#define USBD_MQ_MSG_SZ 32
diff --git a/components/finsh/finsh.h b/components/finsh/finsh.h
index 73c12b3c34..cf13b761d5 100644
--- a/components/finsh/finsh.h
+++ b/components/finsh/finsh.h
@@ -45,7 +45,7 @@ typedef long (*syscall_func)(void);
__TI_FINSH_EXPORT_FUNCTION(__fsym_##cmd); \
const char __fsym_##cmd##_name[] = #cmd; \
const char __fsym_##cmd##_desc[] = #desc; \
- RT_USED RT_NOBLOCKED const struct finsh_syscall __fsym_##cmd = \
+ rt_used RT_NOBLOCKED const struct finsh_syscall __fsym_##cmd = \
{ \
__fsym_##cmd##_name, \
__fsym_##cmd##_desc, \
@@ -53,9 +53,9 @@ typedef long (*syscall_func)(void);
};
#else
#define MSH_FUNCTION_EXPORT_CMD(name, cmd, desc) \
- const char __fsym_##cmd##_name[] RT_SECTION(".rodata.name") = #cmd; \
- const char __fsym_##cmd##_desc[] RT_SECTION(".rodata.name") = #desc; \
- RT_USED const struct finsh_syscall __fsym_##cmd RT_SECTION("FSymTab")= \
+ const char __fsym_##cmd##_name[] rt_section(".rodata.name") = #cmd; \
+ const char __fsym_##cmd##_desc[] rt_section(".rodata.name") = #desc; \
+ rt_used const struct finsh_syscall __fsym_##cmd rt_section("FSymTab")= \
{ \
__fsym_##cmd##_name, \
__fsym_##cmd##_desc, \
@@ -88,7 +88,7 @@ typedef long (*syscall_func)(void);
#else
#define MSH_FUNCTION_EXPORT_CMD(name, cmd, desc) \
const char __fsym_##cmd##_name[] = #cmd; \
- RT_USED const struct finsh_syscall __fsym_##cmd RT_SECTION("FSymTab")= \
+ rt_used const struct finsh_syscall __fsym_##cmd rt_section("FSymTab")= \
{ \
__fsym_##cmd##_name, \
(syscall_func)&name \
diff --git a/components/finsh/shell.c b/components/finsh/shell.c
index fecb4f4af3..321cadd8f9 100644
--- a/components/finsh/shell.c
+++ b/components/finsh/shell.c
@@ -35,7 +35,7 @@
/* finsh thread */
#ifndef RT_USING_HEAP
static struct rt_thread finsh_thread;
- ALIGN(RT_ALIGN_SIZE)
+ rt_align(RT_ALIGN_SIZE)
static char finsh_thread_stack[FINSH_THREAD_STACK_SIZE];
struct finsh_shell _shell;
#endif
diff --git a/components/legacy/rtlegacy.h b/components/legacy/rtlegacy.h
index 19b7f38209..661925dc0b 100644
--- a/components/legacy/rtlegacy.h
+++ b/components/legacy/rtlegacy.h
@@ -14,11 +14,21 @@
#include <rtconfig.h>
#include <rtdef.h>
-/* legacy version macros */
+/* rtdef.h */
+
+/* legacy version macros (<5.0.0) */
#define RT_VERSION RT_VERSION_MAJOR /**< major version number */
#define RT_SUBVERSION RT_VERSION_MINOR /**< minor version number */
#define RT_REVISION RT_VERSION_PATCH /**< revise version number */
+/* legacy attributes define (<5.0.0) */
+#define RT_SECTION rt_section
+#define RT_WEAK rt_weak
+#define RT_USED rt_used
+#ifndef ALIGN
+#define ALIGN rt_align
+#endif
+
/* IPC */
#ifdef RT_USING_DEVICE_IPC
#include "ipc/workqueue_legacy.h"
diff --git a/components/libc/compilers/armlibc/syscalls.c b/components/libc/compilers/armlibc/syscalls.c
index 74097da58f..f163ab1ad9 100644
--- a/components/libc/compilers/armlibc/syscalls.c
+++ b/components/libc/compilers/armlibc/syscalls.c
@@ -310,7 +310,7 @@ void _ttywrch(int ch)
}
/* for exit() and abort() */
-RT_WEAK void _sys_exit(int return_code)
+rt_weak void _sys_exit(int return_code)
{
extern void __rt_libc_exit(int status);
__rt_libc_exit(return_code);
diff --git a/components/libc/compilers/common/ctime.c b/components/libc/compilers/common/ctime.c
index ace480a54b..eb755e2263 100644
--- a/components/libc/compilers/common/ctime.c
+++ b/components/libc/compilers/common/ctime.c
@@ -63,8 +63,8 @@ static const short __spm[13] =
(31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30 + 31),
};
-ALIGN(4) static const char *days = "Sun Mon Tue Wed Thu Fri Sat ";
-ALIGN(4) static const char *months = "Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec ";
+rt_align(4) static const char *days = "Sun Mon Tue Wed Thu Fri Sat ";
+rt_align(4) static const char *months = "Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec ";
static int __isleap(int year)
{
@@ -346,7 +346,7 @@ RTM_EXPORT(strftime); /* inherent in the toolchain */
* If timer is not a NULL pointer, the return value is also stored in timer.
*
*/
-RT_WEAK time_t time(time_t *t)
+rt_weak time_t time(time_t *t)
{
struct timeval now;
@@ -366,7 +366,7 @@ RT_WEAK time_t time(time_t *t)
}
RTM_EXPORT(time);
-RT_WEAK clock_t clock(void)
+rt_weak clock_t clock(void)
{
return rt_tick_get();
}
diff --git a/components/libc/cplusplus/cxx_crt_init.c b/components/libc/cplusplus/cxx_crt_init.c
index 46946089ff..9e5262c101 100644
--- a/components/libc/cplusplus/cxx_crt_init.c
+++ b/components/libc/cplusplus/cxx_crt_init.c
@@ -16,25 +16,25 @@
#if defined(__ARMCC_VERSION)
extern void $Super$$__cpp_initialize__aeabi_(void);
/* we need to change the cpp_initialize order */
-RT_WEAK void $Sub$$__cpp_initialize__aeabi_(void)
+rt_weak void $Sub$$__cpp_initialize__aeabi_(void)
{
/* empty */
}
#elif defined(__GNUC__) && !defined(__CS_SOURCERYGXX_MAJ__)
/* The _init()/_fini() routines has been defined in codesourcery g++ lite */
-RT_WEAK void _init()
+rt_weak void _init()
{
}
-RT_WEAK void _fini()
+rt_weak void _fini()
{
}
-RT_WEAK void *__dso_handle = 0;
+rt_weak void *__dso_handle = 0;
#endif
-RT_WEAK int cplusplus_system_init(void)
+rt_weak int cplusplus_system_init(void)
{
#if defined(__ARMCC_VERSION)
/* If there is no SHT$$INIT_ARRAY, calling
diff --git a/components/lwp/lwp.c b/components/lwp/lwp.c
index 7dafed6a35..9e4dccd14a 100644
--- a/components/lwp/lwp.c
+++ b/components/lwp/lwp.c
@@ -970,7 +970,7 @@ _exit:
}
#endif /* ARCH_MM_MMU */
-RT_WEAK int lwp_load(const char *filename, struct rt_lwp *lwp, uint8_t *load_addr, size_t addr_size, struct process_aux *aux)
+rt_weak int lwp_load(const char *filename, struct rt_lwp *lwp, uint8_t *load_addr, size_t addr_size, struct process_aux *aux)
{
uint8_t *ptr;
int ret = -1;
diff --git a/components/lwp/lwp_avl.c b/components/lwp/lwp_avl.c
index 71eb089264..d9996eae3e 100644
--- a/components/lwp/lwp_avl.c
+++ b/components/lwp/lwp_avl.c
@@ -208,7 +208,7 @@ int lwp_avl_traversal(struct lwp_avl_struct *ptree, int (*fun)(struct lwp_avl_st
return ret;
}
-RT_WEAK struct lwp_avl_struct* lwp_map_find_first(struct lwp_avl_struct* ptree)
+rt_weak struct lwp_avl_struct* lwp_map_find_first(struct lwp_avl_struct* ptree)
{
if (ptree == AVL_EMPTY)
{
diff --git a/components/lwp/lwp_syscall.c b/components/lwp/lwp_syscall.c
index 0c49e3c960..a3e2002851 100644
--- a/components/lwp/lwp_syscall.c
+++ b/components/lwp/lwp_syscall.c
@@ -1599,7 +1599,7 @@ fail:
return GET_ERRNO();
}
-RT_WEAK long sys_clone(void *arg[])
+rt_weak long sys_clone(void *arg[])
{
return _sys_clone(arg);
}
@@ -1829,12 +1829,12 @@ size_t lwp_user_strlen(const char *s, int *err)
/* arm needs to wrap fork/clone call to preserved lr & caller saved regs */
-RT_WEAK int sys_fork(void)
+rt_weak int sys_fork(void)
{
return _sys_fork();
}
-RT_WEAK int sys_vfork(void)
+rt_weak int sys_vfork(void)
{
return sys_fork();
}
diff --git a/components/lwp/page.c b/components/lwp/page.c
index 5cf63be5e0..5dccd5fe34 100644
--- a/components/lwp/page.c
+++ b/components/lwp/page.c
@@ -37,7 +37,7 @@ static size_t page_nr;
static struct page *page_list[ARCH_PAGE_LIST_SIZE];
-RT_WEAK int rt_hw_clz(size_t n)
+rt_weak int rt_hw_clz(size_t n)
{
int bits = sizeof(size_t) * 8;
@@ -66,7 +66,7 @@ RT_WEAK int rt_hw_clz(size_t n)
return bits - n;
}
-RT_WEAK int rt_hw_ctz(size_t n)
+rt_weak int rt_hw_ctz(size_t n)
{
int ret = sizeof(size_t) * 8;
diff --git a/components/net/at/include/at.h b/components/net/at/include/at.h
index 0a385058a0..aec11372dd 100644
--- a/components/net/at/include/at.h
+++ b/components/net/at/include/at.h
@@ -51,7 +51,7 @@ extern "C" {
#endif
#define AT_CMD_EXPORT(_name_, _args_expr_, _test_, _query_, _setup_, _exec_) \
- RT_USED static const struct at_cmd __at_cmd_##_test_##_query_##_setup_##_exec_ RT_SECTION("RtAtCmdTab") = \
+ rt_used static const struct at_cmd __at_cmd_##_test_##_query_##_setup_##_exec_ rt_section("RtAtCmdTab") = \
{ \
_name_, \
_args_expr_, \
diff --git a/components/net/at/src/at_server.c b/components/net/at/src/at_server.c
index 5d6a63fd98..9e5d9174b1 100644
--- a/components/net/at/src/at_server.c
+++ b/components/net/at/src/at_server.c
@@ -638,12 +638,12 @@ __exit:
}
INIT_COMPONENT_EXPORT(at_server_init);
-RT_WEAK void at_port_reset(void)
+rt_weak void at_port_reset(void)
{
LOG_E("The reset for AT server is not implement.");
}
-RT_WEAK void at_port_factory_reset(void)
+rt_weak void at_port_factory_reset(void)
{
LOG_E("The factory reset for AT server is not implement.");
}
diff --git a/components/net/at/src/at_utils.c b/components/net/at/src/at_utils.c
index 736d567dfa..9ffaab199c 100644
--- a/components/net/at/src/at_utils.c
+++ b/components/net/at/src/at_utils.c
@@ -65,7 +65,7 @@ const char *at_get_last_cmd(rt_size_t *cmd_size)
return send_buf;
}
-RT_WEAK rt_size_t at_utils_send(rt_device_t dev,
+rt_weak rt_size_t at_utils_send(rt_device_t dev,
rt_off_t pos,
const void *buffer,
rt_size_t size)
diff --git a/components/net/lwip/port/sys_arch.c b/components/net/lwip/port/sys_arch.c
index 709028ee25..145958a0fb 100644
--- a/components/net/lwip/port/sys_arch.c
+++ b/components/net/lwip/port/sys_arch.c
@@ -539,7 +539,7 @@ u32_t sys_now(void)
return rt_tick_get_millisecond();
}
-RT_WEAK void mem_init(void)
+rt_weak void mem_init(void)
{
}
diff --git a/components/net/netdev/src/netdev_ipaddr.c b/components/net/netdev/src/netdev_ipaddr.c
index afb6d1d962..dd12ee81cf 100644
--- a/components/net/netdev/src/netdev_ipaddr.c
+++ b/components/net/netdev/src/netdev_ipaddr.c
@@ -263,7 +263,7 @@ in_addr_t netdev_ipaddr_addr(const char *cp)
#if NETDEV_IPV6
-RT_WEAK const struct in6_addr in6addr_any = IN6ADDR_ANY_INIT;
+rt_weak const struct in6_addr in6addr_any = IN6ADDR_ANY_INIT;
/**
* Check whether "cp" is a valid ascii representation
diff --git a/components/utilities/ulog/syslog/syslog.c b/components/utilities/ulog/syslog/syslog.c
index d5f31b0c18..474a524b89 100644
--- a/components/utilities/ulog/syslog/syslog.c
+++ b/components/utilities/ulog/syslog/syslog.c
@@ -168,7 +168,7 @@ static const char *get_month_str(uint8_t month)
}
}
-RT_WEAK rt_size_t syslog_formater(char *log_buf, int level, const char *tag, rt_bool_t newline, const char *format, va_list args)
+rt_weak rt_size_t syslog_formater(char *log_buf, int level, const char *tag, rt_bool_t newline, const char *format, va_list args)
{
extern rt_size_t ulog_strcpy(rt_size_t cur_len, char *dst, const char *src);
diff --git a/components/utilities/ulog/ulog.c b/components/utilities/ulog/ulog.c
index 430ead3f1c..539f7ef24c 100644
--- a/components/utilities/ulog/ulog.c
+++ b/components/utilities/ulog/ulog.c
@@ -246,7 +246,7 @@ static char *get_log_buf(void)
}
}
-RT_WEAK rt_size_t ulog_head_formater(char *log_buf, rt_uint32_t level, const char *tag)
+rt_weak rt_size_t ulog_head_formater(char *log_buf, rt_uint32_t level, const char *tag)
{
/* the caller has locker, so it can use static variable for reduce stack usage */
static rt_size_t log_len;
@@ -371,7 +371,7 @@ RT_WEAK rt_size_t ulog_head_formater(char *log_buf, rt_uint32_t level, const cha
}
-RT_WEAK rt_size_t ulog_tail_formater(char *log_buf, rt_size_t log_len, rt_bool_t newline, rt_uint32_t level)
+rt_weak rt_size_t ulog_tail_formater(char *log_buf, rt_size_t log_len, rt_bool_t newline, rt_uint32_t level)
{
/* the caller has locker, so it can use static variable for reduce stack usage */
static rt_size_t newline_len;
@@ -418,7 +418,7 @@ RT_WEAK rt_size_t ulog_tail_formater(char *log_buf, rt_size_t log_len, rt_bool_t
return log_len;
}
-RT_WEAK rt_size_t ulog_formater(char *log_buf, rt_uint32_t level, const char *tag, rt_bool_t newline,
+rt_weak rt_size_t ulog_formater(char *log_buf, rt_uint32_t level, const char *tag, rt_bool_t newline,
const char *format, va_list args)
{
/* the caller has locker, so it can use static variable for reduce stack usage */
@@ -446,7 +446,7 @@ RT_WEAK rt_size_t ulog_formater(char *log_buf, rt_uint32_t level, const char *ta
return ulog_tail_formater(log_buf, log_len, newline, level);
}
-RT_WEAK rt_size_t ulog_hex_formater(char *log_buf, const char *tag, const rt_uint8_t *buf, rt_size_t size, rt_size_t width, rt_base_t addr)
+rt_weak rt_size_t ulog_hex_formater(char *log_buf, const char *tag, const rt_uint8_t *buf, rt_size_t size, rt_size_t width, rt_base_t addr)
{
#define __is_print(ch) ((unsigned int)((ch) - ' ') < 127u - ' ')
/* the caller has locker, so it can use static variable for reduce stack usage */
diff --git a/components/utilities/utest/utest.h b/components/utilities/utest/utest.h
index 33d50efddb..41859612e2 100644
--- a/components/utilities/utest/utest.h
+++ b/components/utilities/utest/utest.h
@@ -137,8 +137,8 @@ utest_t utest_handle_get(void);
*
*/
#define UTEST_TC_EXPORT(testcase, name, init, cleanup, timeout) \
- RT_USED static const struct utest_tc_export _utest_testcase \
- RT_SECTION("UtestTcTab") = \
+ rt_used static const struct utest_tc_export _utest_testcase \
+ rt_section("UtestTcTab") = \
{ \
name, \
timeout, \
diff --git a/components/utilities/var_export/var_export.c b/components/utilities/var_export/var_export.c
index e4146d6ff8..abc412a682 100644
--- a/components/utilities/var_export/var_export.c
+++ b/components/utilities/var_export/var_export.c
@@ -21,22 +21,22 @@ static rt_size_t ve_exporter_num = 0;
/* for ARM C and IAR Compiler */
#if defined(__ARMCC_VERSION) || defined (__ICCARM__) || defined(__ICCRX__)
-static RT_USED const struct ve_exporter __ve_table_start
-RT_SECTION("0.""VarExpTab") = {"ve_start", "ve_start", 0};
+static rt_used const struct ve_exporter __ve_table_start
+rt_section("0.""VarExpTab") = {"ve_start", "ve_start", 0};
-static RT_USED const struct ve_exporter __ve_table_end
-RT_SECTION("2.""VarExpTab") = {"ve_end", "ve_end", 2};
+static rt_used const struct ve_exporter __ve_table_end
+rt_section("2.""VarExpTab") = {"ve_end", "ve_end", 2};
#endif
/* for MS VC++ compiler */
#if defined(_MSC_VER)
#pragma section("VarExpTab$a", read)
__declspec(allocate("VarExpTab$a"))
-RT_USED const struct ve_exporter __ve_table_start = { "ve_start", "ve_start", 0};
+rt_used const struct ve_exporter __ve_table_start = { "ve_start", "ve_start", 0};
#pragma section("VarExpTab$z", read)
__declspec(allocate("VarExpTab$z"))
-RT_USED const struct ve_exporter __ve_table_end = { "ve_end", "ve_end", 2};
+rt_used const struct ve_exporter __ve_table_end = { "ve_end", "ve_end", 2};
/* Find var objects in VarExpTab segments */
static int ve_init_find_obj(unsigned int *begin, unsigned int *end, ve_exporter_t *table)
diff --git a/components/utilities/var_export/var_export.h b/components/utilities/var_export/var_export.h
index b0e2e88b3f..f4ca9122bb 100644
--- a/components/utilities/var_export/var_export.h
+++ b/components/utilities/var_export/var_export.h
@@ -44,10 +44,10 @@ typedef struct ve_iterator ve_iterator_t;
/* exporter's export command */
#if defined(__ARMCC_VERSION) || defined(__IAR_SYSTEMS_ICC__)
#define VAR_EXPORT(module, identi, value) \
- const char _vexp_##identi##_module[] RT_SECTION(".rodata.vexp") = #module; \
- const char _vexp_##identi##_identi[] RT_SECTION(".rodata.vexp") = #identi; \
- RT_USED const struct ve_exporter _vexp_##module##identi \
- RT_SECTION("1."#module".VarExpTab."#identi) = \
+ const char _vexp_##identi##_module[] rt_section(".rodata.vexp") = #module; \
+ const char _vexp_##identi##_identi[] rt_section(".rodata.vexp") = #identi; \
+ rt_used const struct ve_exporter _vexp_##module##identi \
+ rt_section("1."#module".VarExpTab."#identi) = \
{ \
_vexp_##identi##_module, \
_vexp_##identi##_identi, \
@@ -55,10 +55,10 @@ typedef struct ve_iterator ve_iterator_t;
}
#elif defined(__GNUC__)
#define VAR_EXPORT(module, identi, value) \
- const char _vexp_##identi##_module[] RT_SECTION(".rodata.vexp") = #module; \
- const char _vexp_##identi##_identi[] RT_SECTION(".rodata.vexp") = #identi; \
- RT_USED const struct ve_exporter _vexp_##module##identi \
- RT_SECTION(#module".VarExpTab."#identi) = \
+ const char _vexp_##identi##_module[] rt_section(".rodata.vexp") = #module; \
+ const char _vexp_##identi##_identi[] rt_section(".rodata.vexp") = #identi; \
+ rt_used const struct ve_exporter _vexp_##module##identi \
+ rt_section(#module".VarExpTab."#identi) = \
{ \
_vexp_##identi##_module, \
_vexp_##identi##_identi, \
@@ -67,10 +67,10 @@ typedef struct ve_iterator ve_iterator_t;
#elif defined(_MSC_VER)
#pragma section("VarExpTab$f",read)
#define VAR_EXPORT(module, identi, value) \
- const char _vexp_##identi##_module[] RT_SECTION(".rodata.vexp") = #module; \
- const char _vexp_##identi##_identi[] RT_SECTION(".rodata.vexp") = #identi; \
+ const char _vexp_##identi##_module[] rt_section(".rodata.vexp") = #module; \
+ const char _vexp_##identi##_identi[] rt_section(".rodata.vexp") = #identi; \
__declspec(allocate("VarExpTab$f")) \
- RT_USED const struct ve_exporter _vexp_##module##identi = \
+ rt_used const struct ve_exporter _vexp_##module##identi = \
{ \
_vexp_##identi##_module, \
_vexp_##identi##_identi, \
diff --git a/components/vmm/vmm.c b/components/vmm/vmm.c
index 709f947b4e..b37bc4389c 100644
--- a/components/vmm/vmm.c
+++ b/components/vmm/vmm.c
@@ -22,9 +22,9 @@
extern void rt_hw_interrupt_init(void);
extern void rt_application_init(void);
-void vmm_entry(struct vmm_entry_param* param) RT_SECTION(".vmm_init");
+void vmm_entry(struct vmm_entry_param* param) rt_section(".vmm_init");
-struct rt_thread vmm_thread RT_SECTION(".bss.share.vmm");
+struct rt_thread vmm_thread rt_section(".bss.share.vmm");
extern rt_uint8_t vmm_stack_start;
extern rt_uint8_t vmm_stack_end;
@@ -75,7 +75,7 @@ static void vmm_entry_glue(rt_uint32_t level,
unsigned int kernel_domain)
/* inline would make the section setting meaningless */
__attribute__((noinline))
- RT_SECTION(".vmm_glue");
+ rt_section(".vmm_glue");
static void vmm_entry_glue(rt_uint32_t level,
unsigned int vmm_domain,
unsigned int kernel_domain)
diff --git a/components/vmm/vmm_context.c b/components/vmm/vmm_context.c
index bf8f2a058e..8cb502da75 100644
--- a/components/vmm/vmm_context.c
+++ b/components/vmm/vmm_context.c
@@ -18,7 +18,7 @@
#include "vmm_context.h"
-struct rt_vmm_share_layout rt_vmm_share RT_SECTION(".vmm.share");
+struct rt_vmm_share_layout rt_vmm_share rt_section(".vmm.share");
volatile struct vmm_context *_vmm_context = RT_NULL;
@@ -31,13 +31,13 @@ void vmm_context_init(void *context_addr)
}
#ifdef RT_VMM_USING_DOMAIN
-unsigned long guest_domain_val RT_SECTION(".bss.share");
-unsigned long vmm_domain_val RT_SECTION(".bss.share");
+unsigned long guest_domain_val rt_section(".bss.share");
+unsigned long vmm_domain_val rt_section(".bss.share");
/* some RT-Thread code need to be called in the guest
* context(rt_thread_idle_excute for example). To simplify the code, we need a
* "super" domain mode to have access of both side. The code executed in super
* domain mode is restricted and should be harmless. */
-unsigned long super_domain_val RT_SECTION(".bss.share");
+unsigned long super_domain_val rt_section(".bss.share");
void vmm_context_init_domain(struct vmm_domain *domain)
{
asm volatile ("mrc p15, 0, %0, c3, c0\n" : "=r" (guest_domain_val));