aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2009-04-18 10:34:23 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2009-04-18 10:34:23 +0000
commitf332c2881c4a2eef422ed1631a8335d07e9818ad (patch)
tree42cb6be11bcc49a078767c5b9795bdab9d40e2af
parent0a37ec19f6b6c33c157f8280359e7c4468c26ae1 (diff)
downloadChibiOS-f332c2881c4a2eef422ed1631a8335d07e9818ad.tar.gz
ChibiOS-f332c2881c4a2eef422ed1631a8335d07e9818ad.tar.bz2
ChibiOS-f332c2881c4a2eef422ed1631a8335d07e9818ad.zip
Fixed bug 2772237.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@911 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r--demos/ARM7-AT91SAM7X-WEB-GCC/web/webthread.c2
-rw-r--r--readme.txt4
-rw-r--r--src/lib/ch.cpp2
3 files changed, 6 insertions, 2 deletions
diff --git a/demos/ARM7-AT91SAM7X-WEB-GCC/web/webthread.c b/demos/ARM7-AT91SAM7X-WEB-GCC/web/webthread.c
index c9b3b395e..d064e1ef3 100644
--- a/demos/ARM7-AT91SAM7X-WEB-GCC/web/webthread.c
+++ b/demos/ARM7-AT91SAM7X-WEB-GCC/web/webthread.c
@@ -83,7 +83,7 @@ void clock_init(void) {}
clock_time_t clock_time( void )
{
- return chSysGetTime();
+ return chTimeNow();
}
/*
diff --git a/readme.txt b/readme.txt
index e8b31e4b5..ed258a0ee 100644
--- a/readme.txt
+++ b/readme.txt
@@ -83,6 +83,10 @@ Win32-MinGW - ChibiOS/RT simulator and demo into a WIN32 process,
in stable branch).
- FIX: Removed usused list functions (bug 2755230)(backported in stable
branch).
+- FIX: Added license notice to several files (bug 2772160)(backported in
+ stable branch).
+- FIX: Found new instances of the obsolete function chSysGetTime() in the
+ C++ wrapper and in the WEB demo (bug 2772237)(backported in stable branch).
- NEW: Added a code coverage analysis application under ./tests/coverage.
- NEW: Added more test cases in order to improve the test suite code coverage
(it was 74% in version 1.2.0).
diff --git a/src/lib/ch.cpp b/src/lib/ch.cpp
index 5663955cb..46e3a53d7 100644
--- a/src/lib/ch.cpp
+++ b/src/lib/ch.cpp
@@ -47,7 +47,7 @@ namespace chibios_rt {
systime_t System::GetTime(void) {
- return chSysGetTime();
+ return chTimeNow();
}
/*------------------------------------------------------------------------*