rusefi
/
ChibiOS
mirror of https://github.com/rusefi/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Giovanni Di Sirio 2015-04-05 10:32:38 +00:00
parent 2381a70190
commit ae3021458a
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demos/STM32/RT-STM32F407-DISCOVERY-G++/Makefile
View File

@ -30,7 +30,7 @@ endif
# Enable this if you want link time optimizations (LTO)
ifeq ($(USE_LTO),)
USE_LTO = yes
USE_LTO = no
endif
# If enabled, this option allows to compile the application in THUMB mode.

2
demos/STM32/RT-STM32F407-DISCOVERY-G++/debug/RT-STM32F407-DISCOVERY-G++ (OpenOCD, Flash and Run).launch
View File

@ -41,7 +41,7 @@
<booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="true"/>
<stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="0.114656749"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/RT-STM32F407-DISCOVERY-G++/>
<listEntry value="/RT-STM32F407-DISCOVERY-G++"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="4"/>

11
demos/STM32/RT-STM32F407-DISCOVERY-G++/main.cpp
View File

@ -87,20 +87,20 @@ private:
const seqop_t *base, *curr; // Thread local variables.
protected:
virtual msg_t main(void) {
virtual void main(void) {
setName("sequencer");
while (true) {
switch(curr->action) {
case SLEEP:
sleep(curr->value);
sleep(MS2ST(curr->value));
break;
case GOTO:
curr = &base[curr->value];
continue;
case STOP:
return 0;
return;
case BITCLEAR:
palClearPort(GPIOD, curr->value);
break;
@ -125,11 +125,12 @@ public:
class TesterThread : public BaseStaticThread<256> {
protected:
virtual msg_t main(void) {
virtual void main(void) {
setName("tester");
return TestThread(&SD2);
TestThread(&SD2);
exit(test_global_fail);
}
public:

7
os/various/cpp_wrappers/ch.cpp
View File

@ -248,9 +248,8 @@ namespace chibios_rt {
}
msg_t BaseThread::main(void) {
void BaseThread::main(void) {
return 0;
}
ThreadReference BaseThread::start(tprio_t prio) {
@ -260,9 +259,9 @@ namespace chibios_rt {
return *this;
};
msg_t _thd_start(void *arg) {
void _thd_start(void *arg) {
return ((BaseThread *)arg)->main();
((BaseThread *)arg)->main();
}
void BaseThread::setName(const char *tname) {

4
os/various/cpp_wrappers/ch.hpp
View File

@ -440,7 +440,7 @@ namespace chibios_rt {
*
* @api
*/
virtual msg_t main(void);
virtual void main(void);
/**
* @brief Creates and starts a system thread.
@ -787,7 +787,7 @@ namespace chibios_rt {
* @api
*/
virtual ThreadReference start(tprio_t prio) {
msg_t _thd_start(void *arg);
void _thd_start(void *arg);
thread_ref = chThdCreateStatic(wa, sizeof(wa), prio, _thd_start, this);
return *this;