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@421 35acf78f-673a-0410-8e92-d51de3d6d3f4

master
gdisirio 2008-09-03 12:18:39 +00:00
parent d1ffba4de3
commit 071e9457b0
15 changed files with 3 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
demos/ARM7-AT91SAM7X-GCC/chconf.h
View File

@ -46,23 +46,6 @@
* included in the kernel.*/ * included in the kernel.*/
#define CH_USE_SYSTEMTIME #define CH_USE_SYSTEMTIME
/** Configuration option: if specified then the \p chThdSleep() function is
* included in the kernel.
* @note requires \p CH_USE_VIRTUAL_TIMERS.*/
#define CH_USE_SLEEP
/** Configuration option: if specified then the \p chThdResume()
* function is included in the kernel.*/
#define CH_USE_RESUME
/** Configuration option: if specified then the \p chThdSuspend()
* function is included in the kernel.*/
#define CH_USE_SUSPEND
/** Configuration option: if specified then the \p chThdTerminate()
* and \p chThdShouldTerminate() functions are included in the kernel.*/
#define CH_USE_TERMINATE
/** Configuration option: if specified then the \p chThdWait() function /** Configuration option: if specified then the \p chThdWait() function
* is included in the kernel.*/ * is included in the kernel.*/
#define CH_USE_WAITEXIT #define CH_USE_WAITEXIT

17
demos/ARM7-AT91SAM7X-WEB-GCC/chconf.h
View File

@ -46,23 +46,6 @@
* included in the kernel.*/ * included in the kernel.*/
#define CH_USE_SYSTEMTIME #define CH_USE_SYSTEMTIME
/** Configuration option: if specified then the \p chThdSleep() function is
* included in the kernel.
* @note requires \p CH_USE_VIRTUAL_TIMERS.*/
#define CH_USE_SLEEP
/** Configuration option: if specified then the \p chThdResume()
* function is included in the kernel.*/
#define CH_USE_RESUME
/** Configuration option: if specified then the \p chThdSuspend()
* function is included in the kernel.*/
#define CH_USE_SUSPEND
/** Configuration option: if specified then the \p chThdTerminate()
* and \p chThdShouldTerminate() functions are included in the kernel.*/
#define CH_USE_TERMINATE
/** Configuration option: if specified then the \p chThdWait() function /** Configuration option: if specified then the \p chThdWait() function
* is included in the kernel.*/ * is included in the kernel.*/
#define CH_USE_WAITEXIT #define CH_USE_WAITEXIT

17
demos/ARM7-LPC214x-G++/chconf.h
View File

@ -46,23 +46,6 @@
* included in the kernel.*/ * included in the kernel.*/
#define CH_USE_SYSTEMTIME #define CH_USE_SYSTEMTIME
/** Configuration option: if specified then the \p chThdSleep() function is
* included in the kernel.
* @note requires \p CH_USE_VIRTUAL_TIMERS.*/
#define CH_USE_SLEEP
/** Configuration option: if specified then the \p chThdResume()
* function is included in the kernel.*/
#define CH_USE_RESUME
/** Configuration option: if specified then the \p chThdSuspend()
* function is included in the kernel.*/
#define CH_USE_SUSPEND
/** Configuration option: if specified then the \p chThdTerminate()
* and \p chThdShouldTerminate() functions are included in the kernel.*/
#define CH_USE_TERMINATE
/** Configuration option: if specified then the \p chThdWait() function /** Configuration option: if specified then the \p chThdWait() function
* is included in the kernel.*/ * is included in the kernel.*/
#define CH_USE_WAITEXIT #define CH_USE_WAITEXIT

17
demos/ARM7-LPC214x-GCC-minimal/chconf.h
View File

@ -46,23 +46,6 @@
* included in the kernel.*/ * included in the kernel.*/
#define CH_USE_SYSTEMTIME #define CH_USE_SYSTEMTIME
/** Configuration option: if specified then the \p chThdSleep() function is
* included in the kernel.
* @note requires \p CH_USE_VIRTUAL_TIMERS.*/
#define CH_USE_SLEEP
/** Configuration option: if specified then the \p chThdResume()
* function is included in the kernel.*/
#define CH_USE_RESUME
/** Configuration option: if specified then the \p chThdSuspend()
* function is included in the kernel.*/
#define CH_USE_SUSPEND
/** Configuration option: if specified then the \p chThdTerminate()
* and \p chThdShouldTerminate() functions are included in the kernel.*/
//#define CH_USE_TERMINATE
/** Configuration option: if specified then the \p chThdWait() function /** Configuration option: if specified then the \p chThdWait() function
* is included in the kernel.*/ * is included in the kernel.*/
//#define CH_USE_WAITEXIT //#define CH_USE_WAITEXIT

17
demos/ARM7-LPC214x-GCC/chconf.h
View File

@ -46,23 +46,6 @@
* included in the kernel.*/ * included in the kernel.*/
#define CH_USE_SYSTEMTIME #define CH_USE_SYSTEMTIME
/** Configuration option: if specified then the \p chThdSleep() function is
* included in the kernel.
* @note requires \p CH_USE_VIRTUAL_TIMERS.*/
#define CH_USE_SLEEP
/** Configuration option: if specified then the \p chThdResume()
* function is included in the kernel.*/
#define CH_USE_RESUME
/** Configuration option: if specified then the \p chThdSuspend()
* function is included in the kernel.*/
#define CH_USE_SUSPEND
/** Configuration option: if specified then the \p chThdTerminate()
* and \p chThdShouldTerminate() functions are included in the kernel.*/
#define CH_USE_TERMINATE
/** Configuration option: if specified then the \p chThdWait() function /** Configuration option: if specified then the \p chThdWait() function
* is included in the kernel.*/ * is included in the kernel.*/
#define CH_USE_WAITEXIT #define CH_USE_WAITEXIT

17
demos/ARMCM3-STM32F103-GCC/chconf.h
View File

@ -46,23 +46,6 @@
* included in the kernel.*/ * included in the kernel.*/
#define CH_USE_SYSTEMTIME #define CH_USE_SYSTEMTIME
/** Configuration option: if specified then the \p chThdSleep() function is
* included in the kernel.
* @note requires \p CH_USE_VIRTUAL_TIMERS.*/
#define CH_USE_SLEEP
/** Configuration option: if specified then the \p chThdResume()
* function is included in the kernel.*/
#define CH_USE_RESUME
/** Configuration option: if specified then the \p chThdSuspend()
* function is included in the kernel.*/
#define CH_USE_SUSPEND
/** Configuration option: if specified then the \p chThdTerminate()
* and \p chThdShouldTerminate() functions are included in the kernel.*/
#define CH_USE_TERMINATE
/** Configuration option: if specified then the \p chThdWait() function /** Configuration option: if specified then the \p chThdWait() function
* is included in the kernel.*/ * is included in the kernel.*/
#define CH_USE_WAITEXIT #define CH_USE_WAITEXIT

17
demos/AVR-AT90CANx-GCC/chconf.h
View File

@ -46,23 +46,6 @@
* included in the kernel.*/ * included in the kernel.*/
#define CH_USE_SYSTEMTIME #define CH_USE_SYSTEMTIME
/** Configuration option: if specified then the \p chThdSleep() function is
* included in the kernel.
* @note requires \p CH_USE_VIRTUAL_TIMERS.*/
#define CH_USE_SLEEP
/** Configuration option: if specified then the \p chThdResume()
* function is included in the kernel.*/
#define CH_USE_RESUME
/** Configuration option: if specified then the \p chThdSuspend()
* function is included in the kernel.*/
#define CH_USE_SUSPEND
/** Configuration option: if specified then the \p chThdTerminate()
* and \p chThdShouldTerminate() functions are included in the kernel.*/
#define CH_USE_TERMINATE
/** Configuration option: if specified then the \p chThdWait() function /** Configuration option: if specified then the \p chThdWait() function
* is included in the kernel.*/ * is included in the kernel.*/
#define CH_USE_WAITEXIT #define CH_USE_WAITEXIT

17
demos/AVR-ATmega128-GCC/chconf.h
View File

@ -46,23 +46,6 @@
* included in the kernel.*/ * included in the kernel.*/
#define CH_USE_SYSTEMTIME #define CH_USE_SYSTEMTIME
/** Configuration option: if specified then the \p chThdSleep() function is
* included in the kernel.
* @note requires \p CH_USE_VIRTUAL_TIMERS.*/
#define CH_USE_SLEEP
/** Configuration option: if specified then the \p chThdResume()
* function is included in the kernel.*/
#define CH_USE_RESUME
/** Configuration option: if specified then the \p chThdSuspend()
* function is included in the kernel.*/
#define CH_USE_SUSPEND
/** Configuration option: if specified then the \p chThdTerminate()
* and \p chThdShouldTerminate() functions are included in the kernel.*/
#define CH_USE_TERMINATE
/** Configuration option: if specified then the \p chThdWait() function /** Configuration option: if specified then the \p chThdWait() function
* is included in the kernel.*/ * is included in the kernel.*/
#define CH_USE_WAITEXIT #define CH_USE_WAITEXIT

17
demos/MSP430-MSP430x1611-GCC/chconf.h
View File

@ -47,23 +47,6 @@
* included in the kernel.*/ * included in the kernel.*/
#define CH_USE_SYSTEMTIME #define CH_USE_SYSTEMTIME
/** Configuration option: if specified then the \p chThdSleep() function is
* included in the kernel.
* @note requires \p CH_USE_VIRTUAL_TIMERS.*/
#define CH_USE_SLEEP
/** Configuration option: if specified then the \p chThdResume()
* function is included in the kernel.*/
#define CH_USE_RESUME
/** Configuration option: if specified then the \p chThdSuspend()
* function is included in the kernel.*/
#define CH_USE_SUSPEND
/** Configuration option: if specified then the \p chThdTerminate()
* and \p chThdShouldTerminate() functions are included in the kernel.*/
#define CH_USE_TERMINATE
/** Configuration option: if specified then the \p chThdWait() function /** Configuration option: if specified then the \p chThdWait() function
* is included in the kernel.*/ * is included in the kernel.*/
#define CH_USE_WAITEXIT #define CH_USE_WAITEXIT

17
demos/Win32-MinGW/chconf.h
View File

@ -51,23 +51,6 @@
* included in the kernel.*/ * included in the kernel.*/
#define CH_USE_SYSTEMTIME #define CH_USE_SYSTEMTIME
/** Configuration option: if specified then the \p chThdSleep() function is
* included in the kernel.
* @note requires \p CH_USE_VIRTUAL_TIMERS.*/
#define CH_USE_SLEEP
/** Configuration option: if specified then the \p chThdResume()
* function is included in the kernel.*/
#define CH_USE_RESUME
/** Configuration option: if specified then the \p chThdSuspend()
* function is included in the kernel.*/
#define CH_USE_SUSPEND
/** Configuration option: if specified then the \p chThdTerminate()
* and \p chThdShouldTerminate() functions are included in the kernel.*/
#define CH_USE_TERMINATE
/** Configuration option: if specified then the \p chThdWait() function /** Configuration option: if specified then the \p chThdWait() function
* is included in the kernel.*/ * is included in the kernel.*/
#define CH_USE_WAITEXIT #define CH_USE_WAITEXIT

5
readme.txt
View File

@ -92,8 +92,9 @@ Win32-MinGW - ChibiOS/RT simulator and demo into a WIN32 process,
- FIX: Corrected the wrong definition of the chThdResumeI() macro. - FIX: Corrected the wrong definition of the chThdResumeI() macro.
- CHANGE: Now the chThdResume() asserts that the thread is in PRSUSPEND state - CHANGE: Now the chThdResume() asserts that the thread is in PRSUSPEND state
rather than test it. rather than test it.
- CHANGE: Removed the CH_USE_SUSPEND and CH_USE_RESUME configuration options - CHANGE: Removed the CH_USE_TERMINATE, CH_USE_SLEEP, CH_USE_SUSPEND and
in order to make the chconf.h file simpler. CH_USE_RESUME configuration options in order to make the chconf.h file
simpler. The related functions are very small and almost always required.
- Added new test cases to the test suite. - Added new test cases to the test suite.
*** 0.6.10 *** *** 0.6.10 ***

4
src/chsleep.c
View File

@ -24,7 +24,6 @@
#include <ch.h> #include <ch.h>
#ifdef CH_USE_SLEEP
/** /**
* Suspends the invoking thread for the specified time. * Suspends the invoking thread for the specified time.
* @param time the system ticks number * @param time the system ticks number
@ -32,12 +31,9 @@
void chThdSleep(systime_t time) { void chThdSleep(systime_t time) {
chSysLock(); chSysLock();
chSchGoSleepTimeoutS(PRSLEEP, time); chSchGoSleepTimeoutS(PRSLEEP, time);
chSysUnlock(); chSysUnlock();
} }
#endif /* CH_USE_SLEEP */
#ifdef CH_USE_SYSTEMTIME #ifdef CH_USE_SYSTEMTIME
/** /**

4
src/chthreads.c
View File

@ -204,7 +204,6 @@ void chThdResume(Thread *tp) {
chSysUnlock(); chSysUnlock();
} }
#ifdef CH_USE_TERMINATE
/** /**
* Requests a thread termination. * Requests a thread termination.
* @param tp the pointer to the thread * @param tp the pointer to the thread
@ -215,12 +214,9 @@ void chThdResume(Thread *tp) {
void chThdTerminate(Thread *tp) { void chThdTerminate(Thread *tp) {
chSysLock(); chSysLock();
tp->p_flags |= P_TERMINATE; tp->p_flags |= P_TERMINATE;
chSysUnlock(); chSysUnlock();
} }
#endif
/** /**
* Terminates the current thread by specifying an exit status code. * Terminates the current thread by specifying an exit status code.

10
src/include/threads.h
View File

@ -135,14 +135,10 @@ struct Thread {
/** Thread state: After termination.*/ /** Thread state: After termination.*/
#define PREXIT 10 #define PREXIT 10
#ifdef CH_USE_TERMINATE
/** Thread option: Termination requested flag.*/ /** Thread option: Termination requested flag.*/
#define P_TERMINATE 1 #define P_TERMINATE 1
#endif
#ifdef CH_USE_RESUME
/** Thread option: Create suspended thread.*/ /** Thread option: Create suspended thread.*/
#define P_SUSPENDED 2 #define P_SUSPENDED 2
#endif
#ifdef CH_USE_MESSAGES_PRIORITY #ifdef CH_USE_MESSAGES_PRIORITY
/** Thread option: Serve messages by priority instead of FIFO order.*/ /** Thread option: Serve messages by priority instead of FIFO order.*/
#define P_MSGBYPRIO 4 #define P_MSGBYPRIO 4
@ -179,15 +175,9 @@ extern "C" {
size_t wsize, tfunc_t pf); size_t wsize, tfunc_t pf);
void chThdSetPriority(tprio_t newprio); void chThdSetPriority(tprio_t newprio);
void chThdExit(msg_t msg); void chThdExit(msg_t msg);
#ifdef CH_USE_RESUME
void chThdResume(Thread *tp); void chThdResume(Thread *tp);
#endif
#ifdef CH_USE_SUSPEND
void chThdSuspend(Thread **tpp); void chThdSuspend(Thread **tpp);
#endif
#ifdef CH_USE_TERMINATE
void chThdTerminate(Thread *tp); void chThdTerminate(Thread *tp);
#endif
#ifdef CH_USE_WAITEXIT #ifdef CH_USE_WAITEXIT
msg_t chThdWait(Thread *tp); msg_t chThdWait(Thread *tp);
#endif #endif

17
src/templates/chconf.h
View File

@ -47,23 +47,6 @@
* included in the kernel.*/ * included in the kernel.*/
#define CH_USE_SYSTEMTIME #define CH_USE_SYSTEMTIME
/** Configuration option: if specified then the \p chThdSleep() function is
* included in the kernel.
* @note requires \p CH_USE_VIRTUAL_TIMERS.*/
#define CH_USE_SLEEP
/** Configuration option: if specified then the \p chThdResume()
* function is included in the kernel.*/
#define CH_USE_RESUME
/** Configuration option: if specified then the \p chThdSuspend()
* function is included in the kernel.*/
#define CH_USE_SUSPEND
/** Configuration option: if specified then the \p chThdTerminate()
* and \p chThdShouldTerminate() functions are included in the kernel.*/
#define CH_USE_TERMINATE
/** Configuration option: if specified then the \p chThdWait() function /** Configuration option: if specified then the \p chThdWait() function
* is included in the kernel.*/ * is included in the kernel.*/
#define CH_USE_WAITEXIT #define CH_USE_WAITEXIT