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

19 files changed, 102 insertions, 7 deletions

diff --git a/boards/OLIMEX_STM32_P103/board.h b/boards/OLIMEX_STM32_P103/board.h
index a9d33cd42..f5345d4ac 100644
--- a/boards/OLIMEX_STM32_P103/board.h
+++ b/boards/OLIMEX_STM32_P103/board.h
@@ -28,7 +28,7 @@
  * Board identifier.
  */

 #define BOARD_OLIMEX_STM32_P103

-#define BOARD_NAME "Olimex STM33-P103"

+#define BOARD_NAME "Olimex STM32-P103"

 

 /*

  * Board frequencies.

diff --git a/os/hal/platforms/AT91SAM7/hal_lld.h b/os/hal/platforms/AT91SAM7/hal_lld.h
index 958353702..70b62e31c 100644
--- a/os/hal/platforms/AT91SAM7/hal_lld.h
+++ b/os/hal/platforms/AT91SAM7/hal_lld.h
@@ -34,6 +34,11 @@
 /* Driver constants.                                                         */

 /*===========================================================================*/

 

+/**

+ * @brief   Platform name.

+ */

+#define PLATFORM_NAME   "AT91SAM7x"

+

 /*===========================================================================*/

 /* Driver pre-compile time settings.                                         */

 /*===========================================================================*/

diff --git a/os/hal/platforms/AVR/hal_lld.h b/os/hal/platforms/AVR/hal_lld.h
index 65b5da55f..03bf5722e 100644
--- a/os/hal/platforms/AVR/hal_lld.h
+++ b/os/hal/platforms/AVR/hal_lld.h
@@ -31,6 +31,11 @@
 /* Driver constants.                                                         */

 /*===========================================================================*/

 

+/**

+ * @brief   Platform name.

+ */

+#define PLATFORM_NAME   "ATmega128"

+

 /*===========================================================================*/

 /* Driver pre-compile time settings.                                         */

 /*===========================================================================*/

diff --git a/os/hal/platforms/LPC214x/hal_lld.h b/os/hal/platforms/LPC214x/hal_lld.h
index e342fcab6..98905aac9 100644
--- a/os/hal/platforms/LPC214x/hal_lld.h
+++ b/os/hal/platforms/LPC214x/hal_lld.h
@@ -34,6 +34,11 @@
 /* Driver constants.                                                         */

 /*===========================================================================*/

 

+/**

+ * @brief   Platform name.

+ */

+#define PLATFORM_NAME   "LPC214x"

+

 /*===========================================================================*/

 /* Driver pre-compile time settings.                                         */

 /*===========================================================================*/

diff --git a/os/hal/platforms/Linux/hal_lld.h b/os/hal/platforms/Linux/hal_lld.h
index 42f8f5268..d4bac85a7 100644
--- a/os/hal/platforms/Linux/hal_lld.h
+++ b/os/hal/platforms/Linux/hal_lld.h
@@ -35,6 +35,11 @@
 /* Driver constants.                                                         */

 /*===========================================================================*/

 

+/**

+ * @brief   Platform name.

+ */

+#define PLATFORM_NAME   "Linux"

+

 #define SOCKET int

 #define INVALID_SOCKET -1

 

diff --git a/os/hal/platforms/MSP430/hal_lld.h b/os/hal/platforms/MSP430/hal_lld.h
index 236ee56c4..1d2fb6109 100644
--- a/os/hal/platforms/MSP430/hal_lld.h
+++ b/os/hal/platforms/MSP430/hal_lld.h
@@ -33,6 +33,11 @@
 /* Driver constants.                                                         */

 /*===========================================================================*/

 

+/**

+ * @brief   Platform name.

+ */

+#define PLATFORM_NAME   "MSP430x16x"

+

 #define MSP430_CLOCK_SOURCE_XT2CLK  0   /** @brief XT2CLK clock selector.   */

 #define MSP430_CLOCK_SOURCE_DCOCLK  1   /** @brief DCOCLK clock selector.   */

 

diff --git a/os/hal/platforms/SPC563/hal_lld.h b/os/hal/platforms/SPC563/hal_lld.h
index a44537c62..2c6df9b10 100644
--- a/os/hal/platforms/SPC563/hal_lld.h
+++ b/os/hal/platforms/SPC563/hal_lld.h
@@ -34,6 +34,11 @@
 /* Driver constants.                                                         */

 /*===========================================================================*/

 

+/**

+ * @brief   Platform name.

+ */

+#define PLATFORM_NAME   "SPC563M64"

+

 #define RFD_DIV2                    0       /**< Divide VCO frequency by 2. */

 #define RFD_DIV4                    1       /**< Divide VCO frequency by 4. */

 #define RFD_DIV8                    2       /**< Divide VCO frequency by 8. */

diff --git a/os/hal/platforms/STM32/hal_lld.h b/os/hal/platforms/STM32/hal_lld.h
index ed25dad74..db2a9c390 100644
--- a/os/hal/platforms/STM32/hal_lld.h
+++ b/os/hal/platforms/STM32/hal_lld.h
@@ -44,6 +44,11 @@
 /* Driver constants.                                                         */

 /*===========================================================================*/

 

+/**

+ * @brief   Platform name.

+ */

+#define PLATFORM_NAME   "STM32"

+

 /*===========================================================================*/

 /* Driver pre-compile time settings.                                         */

 /*===========================================================================*/

diff --git a/os/hal/platforms/Win32/hal_lld.h b/os/hal/platforms/Win32/hal_lld.h
index 5a895ce95..16a861c58 100644
--- a/os/hal/platforms/Win32/hal_lld.h
+++ b/os/hal/platforms/Win32/hal_lld.h
@@ -34,6 +34,11 @@
 /* Driver constants.                                                         */

 /*===========================================================================*/

 

+/**

+ * @brief   Platform name.

+ */

+#define PLATFORM_NAME   "Win32"

+

 /*===========================================================================*/

 /* Driver pre-compile time settings.                                         */

 /*===========================================================================*/

diff --git a/os/hal/templates/hal_lld.h b/os/hal/templates/hal_lld.h
index c9734d5b5..c5393b522 100644
--- a/os/hal/templates/hal_lld.h
+++ b/os/hal/templates/hal_lld.h
@@ -32,6 +32,11 @@
 /* Driver constants.                                                         */

 /*===========================================================================*/

 

+/**

+ * @brief   Platform name.
+ */

+#define PLATFORM_NAME   ""

+

 /*===========================================================================*/

 /* Driver pre-compile time settings.                                         */

 /*===========================================================================*/

diff --git a/os/kernel/templates/chcore.h b/os/kernel/templates/chcore.h
index 821296bc3..bf72fc042 100644
--- a/os/kernel/templates/chcore.h
+++ b/os/kernel/templates/chcore.h
@@ -41,6 +41,11 @@
 #define CH_ARCHITECTURE_NAME ""

 

 /**

+ * @brief   Name of the architecture variant (optional).
+ */

+#define CH_ARCHITECTURE_VARIANT_NAME ""

+

+/**

  * @brief   Base type for stack alignment.

  * @details This type is used only for stack alignment reasons thus can be

  *          anything from a char to a double.

diff --git a/os/ports/GCC/ARM7/chcore.h b/os/ports/GCC/ARM7/chcore.h
index ff96a419c..f32ec0293 100644
--- a/os/ports/GCC/ARM7/chcore.h
+++ b/os/ports/GCC/ARM7/chcore.h
@@ -43,7 +43,12 @@
 /**

  * Name of the implemented architecture.

  */

-#define CH_ARCHITECTURE_NAME "ARM7TDMI"

+#define CH_ARCHITECTURE_NAME "ARM"

+

+/**

+ * @brief   Name of the architecture variant (optional).

+ */

+#define CH_CORE_VARIANT_NAME "ARM7TDMI"

 

 /**

  * 32 bit stack alignment.

diff --git a/os/ports/GCC/ARMCM3/chcore.h b/os/ports/GCC/ARMCM3/chcore.h
index c1b9591e0..1b72a454d 100644
--- a/os/ports/GCC/ARMCM3/chcore.h
+++ b/os/ports/GCC/ARMCM3/chcore.h
@@ -91,7 +91,12 @@
 /**

  * Name of the implemented architecture.

  */

-#define CH_ARCHITECTURE_NAME "ARM Cortex-M3"

+#define CH_ARCHITECTURE_NAME "ARM"

+

+/**

+ * @brief   Name of the architecture variant (optional).

+ */

+#define CH_CORE_VARIANT_NAME "Cortex-M3"

 

 /**

  * 32 bit stack alignment.

diff --git a/os/ports/GCC/AVR/chcore.h b/os/ports/GCC/AVR/chcore.h
index b452e0227..d37f31899 100644
--- a/os/ports/GCC/AVR/chcore.h
+++ b/os/ports/GCC/AVR/chcore.h
@@ -48,6 +48,11 @@
 #define CH_ARCHITECTURE_NAME "AVR"

 

 /**

+ * @brief   Name of the architecture variant (optional).

+ */

+#define CH_CORE_VARIANT_NAME "MegaAVR"

+

+/**

  * 8 bit stack alignment.

  */

 typedef uint8_t stkalign_t;

diff --git a/os/ports/GCC/MSP430/chcore.h b/os/ports/GCC/MSP430/chcore.h
index 8ae84b5c1..63616d287 100644
--- a/os/ports/GCC/MSP430/chcore.h
+++ b/os/ports/GCC/MSP430/chcore.h
@@ -48,6 +48,11 @@
 #define CH_ARCHITECTURE_NAME "MSP430"

 

 /**

+ * @brief   Name of the architecture variant (optional).

+ */

+#define CH_CORE_VARIANT_NAME "MSP430"

+

+/**

  * 16 bit stack alignment.

  */

 typedef uint16_t stkalign_t;

diff --git a/os/ports/GCC/PPC/chcore.h b/os/ports/GCC/PPC/chcore.h
index 29ac76b15..3f3ce61af 100644
--- a/os/ports/GCC/PPC/chcore.h
+++ b/os/ports/GCC/PPC/chcore.h
@@ -47,7 +47,12 @@
 /**

  * @brief   Name of the implemented architecture.
  */

-#define CH_ARCHITECTURE_NAME "PPC E200Zx"

+#define CH_ARCHITECTURE_NAME "PowerPC"

+

+/**

+ * @brief   Name of the architecture variant (optional).

+ */

+#define CH_CORE_VARIANT_NAME "e200zX"

 

 /**

  * @brief   Base type for stack alignment.
diff --git a/os/ports/GCC/SIMIA32/chcore.h b/os/ports/GCC/SIMIA32/chcore.h
index 00e33faa1..a65eb9640 100644
--- a/os/ports/GCC/SIMIA32/chcore.h
+++ b/os/ports/GCC/SIMIA32/chcore.h
@@ -33,7 +33,12 @@
 /**

  * Name of the implemented architecture.

  */

-#define CH_ARCHITECTURE_NAME "x86 Simulator"

+#define CH_ARCHITECTURE_NAME "Simulator"

+

+/**

+ * @brief   Name of the architecture variant (optional).

+ */

+#define CH_CORE_VARIANT_NAME "x86 (integer only)"

 

 /**

  * 16 bytes stack alignment.

diff --git a/readme.txt b/readme.txt
index 96b3e5cba..5e9505c28 100644
--- a/readme.txt
+++ b/readme.txt
@@ -65,6 +65,8 @@
 - NEW: Added an experimental PowerPC port targeting the SPC563M64/MPC563x

   ST/Freescale automotive SOCs. The port passed the whole test suite but it

   will be developed further in next releases.

+- NEW: Added core variant name macro in chcore.h and platform name in

+  hal_lld.h, the info are printed in the test report.

 - NEW: Added BOARD_NAME macro to the various board.h files.

 - NEW: Added a MemoryStream class under ./os/various.

 

diff --git a/test/test.c b/test/test.c
index 774ab774d..33a971e08 100644
--- a/test/test.c
+++ b/test/test.c
@@ -18,6 +18,7 @@
 */

 

 #include "ch.h"

+#include "hal.h"

 

 #include "test.h"

 #include "testthd.h"

@@ -264,12 +265,24 @@ msg_t TestThread(void *p) {
   test_println("***");

   test_print("*** Kernel:       ");

   test_println(CH_KERNEL_VERSION);

-  test_print("*** Architecture: ");

-  test_println(CH_ARCHITECTURE_NAME);

 #ifdef __GNUC__

   test_print("*** GCC Version:  ");

   test_println(__VERSION__);

 #endif

+  test_print("*** Architecture: ");

+  test_println(CH_ARCHITECTURE_NAME);

+#ifdef CH_CORE_VARIANT_NAME

+  test_print("*** Core Variant: ");

+  test_println(CH_CORE_VARIANT_NAME);

+#endif

+#ifdef PLATFORM_NAME

+  test_print("*** Platform:     ");

+  test_println(PLATFORM_NAME);

+#endif

+#ifdef BOARD_NAME

+  test_print("*** Test Board:   ");

+  test_println(BOARD_NAME);

+#endif

   test_println("");

 

   global_fail = FALSE;