zcy
/
tinySA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4733 35acf78f-673a-0410-8e92-d51de3d6d3f4

master
gdisirio 2012-10-03 19:35:13 +00:00
parent c17f03701a
commit 6d1ecacaf4
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
os/kernel/include/chregistry.h
View File

@ -35,9 +35,9 @@
* @brief ChibiOS/RT memory signature record. * @brief ChibiOS/RT memory signature record.
*/ */
typedef struct { typedef struct {
char ch_identifier[4]; /**< @brief Always set to "CHRT". */ char ch_identifier[4]; /**< @brief Always set to "main". */
uint8_t ch_zero; /**< @brief Must be zero. */
uint8_t ch_size; /**< @brief Size of this structure. */ uint8_t ch_size; /**< @brief Size of this structure. */
uint8_t ch_reserved5; /**< @brief Reserved field. */
uint16_t ch_version; /**< @brief Encoded ChibiOS/RT version. */ uint16_t ch_version; /**< @brief Encoded ChibiOS/RT version. */
uint8_t ch_ptrsize; /**< @brief Size of a pointer. */ uint8_t ch_ptrsize; /**< @brief Size of a pointer. */
uint8_t ch_timesize; /**< @brief Size of a @p systime_t. */ uint8_t ch_timesize; /**< @brief Size of a @p systime_t. */
@ -116,7 +116,7 @@ typedef struct {
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
extern volatile ROMCONST chdebug_t ch_debug; extern ROMCONST chdebug_t ch_debug;
Thread *chRegFirstThread(void); Thread *chRegFirstThread(void);
Thread *chRegNextThread(Thread *tp); Thread *chRegNextThread(Thread *tp);
#ifdef __cplusplus #ifdef __cplusplus

6
os/kernel/src/chregistry.c
View File

@ -56,10 +56,10 @@
/* /*
* OS signature in ROM plus debug-related information. * OS signature in ROM plus debug-related information.
*/ */
volatile ROMCONST chdebug_t ch_debug = { ROMCONST chdebug_t ch_debug = {
"CHRT", "main",
(uint8_t)sizeof (chdebug_t),
(uint8_t)0, (uint8_t)0,
(uint8_t)sizeof (chdebug_t),
(uint16_t)((CH_KERNEL_MAJOR << 11) | (uint16_t)((CH_KERNEL_MAJOR << 11) |
(CH_KERNEL_MINOR << 6) | (CH_KERNEL_MINOR << 6) |
(CH_KERNEL_PATCH) << 0), (CH_KERNEL_PATCH) << 0),

7
os/kernel/src/chsys.c
View File

@ -83,9 +83,6 @@ void chSysInit(void) {
port_init(); port_init();
_scheduler_init(); _scheduler_init();
_vt_init(); _vt_init();
#if CH_USE_REGISTRY
(void)&ch_debug;
#endif
#if CH_USE_MEMCORE #if CH_USE_MEMCORE
_core_init(); _core_init();
#endif #endif
@ -106,7 +103,11 @@ void chSysInit(void) {
#endif #endif
chSysEnable(); chSysEnable();
#if CH_USE_REGISTRY
chRegSetThreadName((const char *)&ch_debug);
#else
chRegSetThreadName("main"); chRegSetThreadName("main");
#endif
#if !CH_NO_IDLE_THREAD #if !CH_NO_IDLE_THREAD
/* This thread has the lowest priority in the system, its role is just to /* This thread has the lowest priority in the system, its role is just to