diff options
| author | Bernard Xiong <[email protected]> | 2015-09-24 17:23:00 +0800 |
|---|---|---|
| committer | Bernard Xiong <[email protected]> | 2015-09-24 17:23:00 +0800 |
| commit | 9413a61499a98cd86df0e4abb39da9f681dbdd81 (patch) | |
| tree | b794148debd7b1668a8c7fbfdf67571cb608ea25 /include | |
| parent | 6a7638599ca0d23d5e40f7a36a13d8be3e47543a (diff) | |
| parent | a8dc960ba1f1bbe7758cd8db24b886d96ae2c96c (diff) | |
Merge branch 'master' of https://git.coding.net/RT-Thread/rt-thread
Diffstat (limited to 'include')
| -rw-r--r-- | include/rtdef.h | 5 | ||||
| -rw-r--r-- | include/rtm.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/rtdef.h b/include/rtdef.h index 2587df9c41..a3dad27989 100644 --- a/include/rtdef.h +++ b/include/rtdef.h @@ -758,8 +758,9 @@ enum rt_device_class_type RT_Device_Class_PM, /**< PM pseudo device */ RT_Device_Class_Pipe, /**< Pipe device */ RT_Device_Class_Portal, /**< Portal device */ - RT_Device_Class_Miscellaneous, /**< Miscellaneous device */ - RT_Device_Class_Unknown /**< unknown device */ + RT_Device_Class_Timer, /**< Timer device */ + RT_Device_Class_Miscellaneous, /**< Miscellaneous device */ + RT_Device_Class_Unknown /**< unknown device */ }; /** diff --git a/include/rtm.h b/include/rtm.h index e888153a14..05419e4420 100644 --- a/include/rtm.h +++ b/include/rtm.h @@ -42,7 +42,7 @@ __declspec(allocate("RTMSymTab$f"))const char __rtmsym_##symbol##_name[] = "__vs #else #define RTM_EXPORT(symbol) \ -const char __rtmsym_##symbol##_name[] SECTION(".name") = #symbol; \ +const char __rtmsym_##symbol##_name[] SECTION(".rodata.name") = #symbol; \ const struct rt_module_symtab __rtmsym_##symbol SECTION("RTMSymTab")= \ { \ (void *)&symbol, \ |