From af629fb73e63aa3dc6a6ae3954be99c7c4425350 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@mur.at>
Date: Tue, 14 Jan 2014 20:20:10 +0000
Subject: upgrade to ChibiOS 2.6.2

git-svn-id: https://svn.spreadspace.org/mur.sat@861 7de4ea59-55d0-425e-a1af-a3118ea81d4c
---
 software/mpu/Makefile           |  2 +-
 software/mpu/board-F405/board.c | 15 +++++++--------
 software/mpu/board-F405/board.h |  4 ++--
 software/mpu/mcuconf-F405.h     |  2 +-
 software/mpu/usb-cdc-shell.c    | 24 ++++++++++++------------
 5 files changed, 23 insertions(+), 24 deletions(-)

(limited to 'software')

diff --git a/software/mpu/Makefile b/software/mpu/Makefile
index 92acc6b..dce1dfe 100644
--- a/software/mpu/Makefile
+++ b/software/mpu/Makefile
@@ -85,7 +85,7 @@ endif
 PROJECT = mpu
 
 # Imported source files and paths
-CHIBIOS = ../../contrib/ChibiOS_2.6.1
+CHIBIOS = ../../contrib/ChibiOS_2.6.2
 include board.mk
 include $(CHIBIOS)/os/hal/platforms/$(STM_TYPE)/platform.mk
 include $(CHIBIOS)/os/hal/hal.mk
diff --git a/software/mpu/board-F405/board.c b/software/mpu/board-F405/board.c
index a0ca77f..e66dd1c 100644
--- a/software/mpu/board-F405/board.c
+++ b/software/mpu/board-F405/board.c
@@ -17,12 +17,12 @@
 #include "ch.h"
 #include "hal.h"
 
-#if HAL_USE_PAL || defined(__DOXYGEN__)
 /**
  * @brief   PAL setup.
  * @details Digital I/O ports static configuration as defined in @p board.h.
  *          This variable is used by the HAL when initializing the PAL driver.
  */
+#if HAL_USE_PAL || defined(__DOXYGEN__)
 const PALConfig pal_default_config =
 {
   {VAL_GPIOA_MODER, VAL_GPIOA_OTYPER, VAL_GPIOA_OSPEEDR, VAL_GPIOA_PUPDR,
@@ -46,19 +46,18 @@ const PALConfig pal_default_config =
 };
 #endif
 
-/**
- * @brief   Early initialization code.
- * @details This initialization must be performed just after stack setup
- *          and before any other initialization.
+/*
+ * Early initialization code.
+ * This initialization must be performed just after stack setup and before
+ * any other initialization.
  */
 void __early_init(void) {
 
   stm32_clock_init();
 }
 
-/**
- * @brief   Board-specific initialization code.
- * @todo    Add your board-specific code, if any.
+/*
+ * Board-specific initialization code.
  */
 void boardInit(void) {
 }
diff --git a/software/mpu/board-F405/board.h b/software/mpu/board-F405/board.h
index f1e2251..9f2017c 100644
--- a/software/mpu/board-F405/board.h
+++ b/software/mpu/board-F405/board.h
@@ -46,9 +46,9 @@
 #define STM32_VDD                   330
 
 /*
- * MCU type as defined in the ST header file stm32f4xx.h.
+ * MCU type as defined in the ST header.
  */
-#define STM32F4XX
+#define STM32F40_41xxx
 
 /*
  * IO pins assignments.
diff --git a/software/mpu/mcuconf-F405.h b/software/mpu/mcuconf-F405.h
index 596a3cb..b2d1fae 100644
--- a/software/mpu/mcuconf-F405.h
+++ b/software/mpu/mcuconf-F405.h
@@ -57,9 +57,9 @@
 #define STM32_I2SSRC                        STM32_I2SSRC_CKIN
 #define STM32_PLLI2SN_VALUE                 192
 #define STM32_PLLI2SR_VALUE                 5
-#define STM32_VOS                           STM32_VOS_HIGH
 #define STM32_PVD_ENABLE                    FALSE
 #define STM32_PLS                           STM32_PLS_LEV0
+#define STM32_BKPRAM_ENABLE                 FALSE
 
 /*
  * ADC driver system settings.
diff --git a/software/mpu/usb-cdc-shell.c b/software/mpu/usb-cdc-shell.c
index 729340a..e2fb452 100644
--- a/software/mpu/usb-cdc-shell.c
+++ b/software/mpu/usb-cdc-shell.c
@@ -282,18 +282,18 @@ static void cmd_reboot(BaseSequentialStream *chp, int argc, char *argv[])
   shellExit(RDY_OK);
 }
 
-static void cmd_bootloader(BaseSequentialStream *chp, int argc, char *argv[])
-{
-  (void)argv;
-  if (argc > 0) {
-    chprintf(chp, "Usage: bootloader\r\n");
-    return;
-  }
-  shell_return_code = MPU_BOOTLOADER;
-  chprintf(chp, "rebooting to bootloader ... ignored - not implemented!!\r\n");
-
-  /* shellExit(RDY_OK); */
-}
+/* static void cmd_bootloader(BaseSequentialStream *chp, int argc, char *argv[]) */
+/* { */
+/*   (void)argv; */
+/*   if (argc > 0) { */
+/*     chprintf(chp, "Usage: bootloader\r\n"); */
+/*     return; */
+/*   } */
+/*   shell_return_code = MPU_BOOTLOADER; */
+/*   chprintf(chp, "rebooting to bootloader ... ignored - not implemented!!\r\n"); */
+
+/*   /\* shellExit(RDY_OK); *\/ */
+/* } */
 
 static const ShellCommand commands[] = {
   {"mem", cmd_mem},
-- 
cgit v1.2.3