From 17c6e5cd7f87de96931c8b4faac8e4d50499477c Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Fri, 25 Dec 2009 09:19:43 +0000
Subject: Fixed bug 2921012.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1469 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
os/hal/platforms/Linux/hal_lld.c | 2 +-
os/hal/platforms/Win32/hal_lld.c | 3 +--
os/ports/GCC/SIMIA32/chcore.h | 10 +++++-----
3 files changed, 7 insertions(+), 8 deletions(-)
(limited to 'os')
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
--
cgit v1.2.3