Fixed bug 2921012.

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

5 files changed, 11 insertions, 9 deletions

diff --git a/os/hal/platforms/Linux/hal_lld.c b/os/hal/platforms/Linux/hal_lld.c
index 3f045b138..713d10637 100644
--- a/os/hal/platforms/Linux/hal_lld.c
+++ b/os/hal/platforms/Linux/hal_lld.c
@@ -59,7 +59,7 @@ static struct timeval tick = {0, 1000000 / CH_FREQUENCY};
  */

 void hal_lld_init(void) {

 

-  puts("Win32 ChibiOS/RT simulator (Linux)\n");

+  puts("ChibiOS/RT simulator (Linux)\n");

   gettimeofday(&nextcnt, NULL);

   timeradd(&nextcnt, &tick, &nextcnt);

 }

diff --git a/os/hal/platforms/Win32/hal_lld.c b/os/hal/platforms/Win32/hal_lld.c
index 6cf11c02f..6e36a19c6 100644
--- a/os/hal/platforms/Win32/hal_lld.c
+++ b/os/hal/platforms/Win32/hal_lld.c
@@ -62,12 +62,11 @@ void hal_lld_init(void) {
     exit(1);

   }

 

-  printf("Win32 ChibiOS/RT simulator\n\n");

+  printf("ChibiOS/RT simulator (Win32)\n");

   if (!QueryPerformanceFrequency(&slice)) {

     printf("QueryPerformanceFrequency() error");

     exit(1);

   }

-  printf("Core Frequency   %u Hz\n", (int)slice.LowPart);

   slice.QuadPart /= CH_FREQUENCY;

   QueryPerformanceCounter(&nextcnt);

   nextcnt.QuadPart += slice.QuadPart;

diff --git a/os/ports/GCC/SIMIA32/chcore.h b/os/ports/GCC/SIMIA32/chcore.h
index dd8af08eb..a0e26bf29 100644
--- a/os/ports/GCC/SIMIA32/chcore.h
+++ b/os/ports/GCC/SIMIA32/chcore.h
@@ -26,14 +26,14 @@
 #define _CHCORE_H_

 

 /**

- * Macro defining the a simulated architecture into Win32.

+ * Macro defining the a simulated architecture into x86.

  */

-#define CH_ARCHITECTURE_WIN32SIM

+#define CH_ARCHITECTURE_SIMIA32

 

 /**

  * Name of the implemented architecture.

  */

-#define CH_ARCHITECTURE_NAME "WIN32 Simulator"

+#define CH_ARCHITECTURE_NAME "x86 Simulator"

 

 /**

  * 32 bit stack alignment.

@@ -104,8 +104,8 @@ struct context {
 /**

  * Per-thread stack overhead for interrupts servicing, it is used in the

  * calculation of the correct working area size.

- * It requires stack space because the simulated "interrupt handlers" invoke

- * Win32 APIs inside so it better have a lot of space.

+ * It requires stack space because the simulated "interrupt handlers" can

+ * invoke host library functions inside so it better have a lot of space.

  */

 #ifndef INT_REQUIRED_STACK

 #define INT_REQUIRED_STACK 16384

diff --git a/readme.txt b/readme.txt
index 685709247..327d380ac 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,6 +2,9 @@
 *** Releases                                                              ***

 *****************************************************************************

 

+*** 1.3.7 ***

+- FIX: Fixed Linux simulator startup message (bug 2921012).

+

 *** 1.3.6 ***

 - FIX: Fixed missing STM32 PWM low level driver error in platform.mk by

   adding the driver files (bug 2913560).

diff --git a/todo.txt b/todo.txt
index 7ad3229b1..81a560ff6 100644
--- a/todo.txt
+++ b/todo.txt
@@ -12,6 +12,7 @@ Before 1.4.0:
 * Make the heap allocator feed memory chunks from the memory manager.

 * Dedicated syscalls.c support for newlib users.

 * HAL and common device drivers.

+* Multiple heaps, disjoint heaps, heaps in heaps.

 

 After 1.4.x

 - Abstract streams interface.

@@ -22,7 +23,6 @@ After 1.4.x
 - Threads Pools manager in the library.

 ? Minimal optional C-runtime library (complete enough for lwIP).

 ? Think to something for threads restart.

-? Multiple heaps, disjoint heaps, heaps in heaps.

 - Update C++ wrapper (Heap, Pools, Mailboxes and any new feature).

 

 Ideas for 2.x.x: