switched to chibios 2.6.0

git-svn-id: https://svn.spreadspace.org/mur.sat@823 7de4ea59-55d0-425e-a1af-a3118ea81d4c

7 files changed, 83 insertions, 195 deletions

diff --git a/software/mpu/Makefile b/software/mpu/Makefile
index 0118212..57a89b9 100644
--- a/software/mpu/Makefile
+++ b/software/mpu/Makefile
@@ -58,7 +58,7 @@ endif
 PROJECT = mpu
 
 # Imported source files and paths
-CHIBIOS = ../../contrib/ChibiOS_2.4.3
+CHIBIOS = ../../contrib/ChibiOS_2.6.0
 include board/board.mk
 include $(CHIBIOS)/os/hal/platforms/STM32F1xx/platform.mk
 include $(CHIBIOS)/os/hal/hal.mk
diff --git a/software/mpu/board/board.c b/software/mpu/board/board.c
index 6242200..91ae5c3 100644
--- a/software/mpu/board/board.c
+++ b/software/mpu/board/board.c
@@ -1,28 +1,17 @@
 /*

-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,

-                 2011,2012 Giovanni Di Sirio.

+    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

 

-    This file is part of ChibiOS/RT.

+    Licensed under the Apache License, Version 2.0 (the "License");

+    you may not use this file except in compliance with the License.

+    You may obtain a copy of the License at

 

-    ChibiOS/RT is free software; you can redistribute it and/or modify

-    it under the terms of the GNU General Public License as published by

-    the Free Software Foundation; either version 3 of the License, or

-    (at your option) any later version.

+        http://www.apache.org/licenses/LICENSE-2.0

 

-    ChibiOS/RT is distributed in the hope that it will be useful,

-    but WITHOUT ANY WARRANTY; without even the implied warranty of

-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-    GNU General Public License for more details.

-

-    You should have received a copy of the GNU General Public License

-    along with this program.  If not, see <http://www.gnu.org/licenses/>.

-

-                                      ---

-

-    A special exception to the GPL can be applied should you wish to distribute

-    a combined work that includes ChibiOS/RT, without being obliged to provide

-    the source code for any proprietary components. See the file exception.txt

-    for full details of how and when the exception can be applied.

+    Unless required by applicable law or agreed to in writing, software

+    distributed under the License is distributed on an "AS IS" BASIS,

+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+    See the License for the specific language governing permissions and

+    limitations under the License.

 */

 

 #include "ch.h"

@@ -41,8 +30,6 @@ const PALConfig pal_default_config =
   {VAL_GPIOCODR, VAL_GPIOCCRL, VAL_GPIOCCRH},

   {VAL_GPIODODR, VAL_GPIODCRL, VAL_GPIODCRH},

   {VAL_GPIOEODR, VAL_GPIOECRL, VAL_GPIOECRH},

-  {VAL_GPIOFODR, VAL_GPIOFCRL, VAL_GPIOFCRH},

-  {VAL_GPIOGODR, VAL_GPIOGCRL, VAL_GPIOGCRH},

 };

 #endif

 

diff --git a/software/mpu/board/board.h b/software/mpu/board/board.h
index 53a5e37..e0b2124 100644
--- a/software/mpu/board/board.h
+++ b/software/mpu/board/board.h
@@ -1,28 +1,17 @@
 /*

-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,

-                 2011,2012 Giovanni Di Sirio.

+    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

 

-    This file is part of ChibiOS/RT.

+    Licensed under the Apache License, Version 2.0 (the "License");

+    you may not use this file except in compliance with the License.

+    You may obtain a copy of the License at

 

-    ChibiOS/RT is free software; you can redistribute it and/or modify

-    it under the terms of the GNU General Public License as published by

-    the Free Software Foundation; either version 3 of the License, or

-    (at your option) any later version.

+        http://www.apache.org/licenses/LICENSE-2.0

 

-    ChibiOS/RT is distributed in the hope that it will be useful,

-    but WITHOUT ANY WARRANTY; without even the implied warranty of

-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-    GNU General Public License for more details.

-

-    You should have received a copy of the GNU General Public License

-    along with this program.  If not, see <http://www.gnu.org/licenses/>.

-

-                                      ---

-

-    A special exception to the GPL can be applied should you wish to distribute

-    a combined work that includes ChibiOS/RT, without being obliged to provide

-    the source code for any proprietary components. See the file exception.txt

-    for full details of how and when the exception can be applied.

+    Unless required by applicable law or agreed to in writing, software

+    distributed under the License is distributed on an "AS IS" BASIS,

+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+    See the License for the specific language governing permissions and

+    limitations under the License.

 */

 

 #ifndef _BOARD_H_

@@ -85,10 +74,12 @@
  * PA2  - Alternate output  (USART2 TX).

  * PA3  - Normal input      (USART2 RX).

  * PA8  - Push Pull output (LED).

+ * PA11 - Normal input      (USB DM).

+ * PA12 - Normal input      (USB DP).

  * PA13 - Push Pull output (USB DISC).

  */

 #define VAL_GPIOACRL            0x88884B88      /*  PA7...PA0 */

-#define VAL_GPIOACRH            0x88388883      /* PA15...PA8 */

+#define VAL_GPIOACRH            0x88344883      /* PA15...PA8 */

 #define VAL_GPIOAODR            0xFFFFFFFF

 

 /*

@@ -102,7 +93,6 @@
 /*

  * Port C setup.

  * Everything input with pull-up except:

- *   nothing here

  */

 #define VAL_GPIOCCRL            0x88888888      /*  PC7...PC0 */

 #define VAL_GPIOCCRH            0x88888888      /* PC15...PC8 */

@@ -127,22 +117,6 @@
 #define VAL_GPIOEODR            0xFFFFFFFF

 

 /*

- * Port F setup.

- * Everything input with pull-up except:

- */

-#define VAL_GPIOFCRL            0x88888888      /*  PF7...PF0 */

-#define VAL_GPIOFCRH            0x88888888      /* PF15...PF8 */

-#define VAL_GPIOFODR            0xFFFFFFFF

-

-/*

- * Port G setup.

- * Everything input with pull-up except:

- */

-#define VAL_GPIOGCRL            0x88888888      /*  PG7...PG0 */

-#define VAL_GPIOGCRH            0x88888888      /* PG15...PG8 */

-#define VAL_GPIOGODR            0xFFFFFFFF

-

-/*

  * USB bus activation macro, required by the USB driver.

  */

 #define usb_lld_connect_bus(usbp) palClearPad(GPIOA, GPIOA_USB_DISC)

diff --git a/software/mpu/chconf.h b/software/mpu/chconf.h
index 6d012c3..d841719 100644
--- a/software/mpu/chconf.h
+++ b/software/mpu/chconf.h
@@ -1,28 +1,17 @@
 /*
-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,
-                 2011,2012 Giovanni Di Sirio.
+    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

 
-    This file is part of ChibiOS/RT.
+    Licensed under the Apache License, Version 2.0 (the "License");

+    you may not use this file except in compliance with the License.

+    You may obtain a copy of the License at

 
-    ChibiOS/RT is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
+        http://www.apache.org/licenses/LICENSE-2.0

 
-    ChibiOS/RT is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-                                      ---
-
-    A special exception to the GPL can be applied should you wish to distribute
-    a combined work that includes ChibiOS/RT, without being obliged to provide
-    the source code for any proprietary components. See the file exception.txt
-    for full details of how and when the exception can be applied.
+    Unless required by applicable law or agreed to in writing, software

+    distributed under the License is distributed on an "AS IS" BASIS,

+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+    See the License for the specific language governing permissions and

+    limitations under the License.

 */
 
 /**
diff --git a/software/mpu/halconf.h b/software/mpu/halconf.h
index 25b4771..cd85161 100644
--- a/software/mpu/halconf.h
+++ b/software/mpu/halconf.h
@@ -1,28 +1,17 @@
 /*
-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,
-                 2011,2012 Giovanni Di Sirio.
+    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

 
-    This file is part of ChibiOS/RT.
+    Licensed under the Apache License, Version 2.0 (the "License");

+    you may not use this file except in compliance with the License.

+    You may obtain a copy of the License at

 
-    ChibiOS/RT is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
+        http://www.apache.org/licenses/LICENSE-2.0

 
-    ChibiOS/RT is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-                                      ---
-
-    A special exception to the GPL can be applied should you wish to distribute
-    a combined work that includes ChibiOS/RT, without being obliged to provide
-    the source code for any proprietary components. See the file exception.txt
-    for full details of how and when the exception can be applied.
+    Unless required by applicable law or agreed to in writing, software

+    distributed under the License is distributed on an "AS IS" BASIS,

+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+    See the License for the specific language governing permissions and

+    limitations under the License.

 */
 
 /**
@@ -212,6 +201,13 @@
 /*===========================================================================*/
 /* MAC driver related settings.                                              */
 /*===========================================================================*/
+

+/**

+ * @brief   Enables an event sources for incoming packets.

+ */

+#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)

+#define MAC_USE_ZERO_COPY           FALSE

+#endif

 
 /**
  * @brief   Enables an event sources for incoming packets.
@@ -225,13 +221,6 @@
 /*===========================================================================*/
 
 /**
- * @brief   Block size for MMC transfers.
- */
-#if !defined(MMC_SECTOR_SIZE) || defined(__DOXYGEN__)
-#define MMC_SECTOR_SIZE             512
-#endif
-
-/**
  * @brief   Delays insertions.
  * @details If enabled this options inserts delays into the MMC waiting
  *          routines releasing some extra CPU time for the threads with
@@ -243,32 +232,6 @@
 #define MMC_NICE_WAITING            TRUE
 #endif
 
-/**
- * @brief   Number of positive insertion queries before generating the
- *          insertion event.
- */
-#if !defined(MMC_POLLING_INTERVAL) || defined(__DOXYGEN__)
-#define MMC_POLLING_INTERVAL        10
-#endif
-
-/**
- * @brief   Interval, in milliseconds, between insertion queries.
- */
-#if !defined(MMC_POLLING_DELAY) || defined(__DOXYGEN__)
-#define MMC_POLLING_DELAY           10
-#endif
-
-/**
- * @brief   Uses the SPI polled API for small data transfers.
- * @details Polled transfers usually improve performance because it
- *          saves two context switches and interrupt servicing. Note
- *          that this option has no effect on large transfers which
- *          are always performed using DMAs/IRQs.
- */
-#if !defined(MMC_USE_SPI_POLLING) || defined(__DOXYGEN__)
-#define MMC_USE_SPI_POLLING         TRUE
-#endif
-
 /*===========================================================================*/
 /* SDC driver related settings.                                              */
 /*===========================================================================*/
diff --git a/software/mpu/main.c b/software/mpu/main.c
index e4c6a5b..d30fff8 100644
--- a/software/mpu/main.c
+++ b/software/mpu/main.c
@@ -1,28 +1,17 @@
 /*
-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,
-                 2011,2012 Giovanni Di Sirio.
+    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

 
-    This file is part of ChibiOS/RT.
+    Licensed under the Apache License, Version 2.0 (the "License");

+    you may not use this file except in compliance with the License.

+    You may obtain a copy of the License at

 
-    ChibiOS/RT is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
+        http://www.apache.org/licenses/LICENSE-2.0

 
-    ChibiOS/RT is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-                                      ---
-
-    A special exception to the GPL can be applied should you wish to distribute
-    a combined work that includes ChibiOS/RT, without being obliged to provide
-    the source code for any proprietary components. See the file exception.txt
-    for full details of how and when the exception can be applied.
+    Unless required by applicable law or agreed to in writing, software

+    distributed under the License is distributed on an "AS IS" BASIS,

+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+    See the License for the specific language governing permissions and

+    limitations under the License.

 */
 
 #include "ch.h"
diff --git a/software/mpu/mcuconf.h b/software/mpu/mcuconf.h
index 5cea34e..045b705 100644
--- a/software/mpu/mcuconf.h
+++ b/software/mpu/mcuconf.h
@@ -1,32 +1,23 @@
 /*
-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,
-                 2011,2012 Giovanni Di Sirio.
+    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

 
-    This file is part of ChibiOS/RT.
+    Licensed under the Apache License, Version 2.0 (the "License");

+    you may not use this file except in compliance with the License.

+    You may obtain a copy of the License at

 
-    ChibiOS/RT is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
+        http://www.apache.org/licenses/LICENSE-2.0

 
-    ChibiOS/RT is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+    Unless required by applicable law or agreed to in writing, software

+    distributed under the License is distributed on an "AS IS" BASIS,

+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+    See the License for the specific language governing permissions and

+    limitations under the License.

+*/

 
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-                                      ---
-
-    A special exception to the GPL can be applied should you wish to distribute
-    a combined work that includes ChibiOS/RT, without being obliged to provide
-    the source code for any proprietary components. See the file exception.txt
-    for full details of how and when the exception can be applied.
-*/
+#define STM32F103_MCUCONF

 
 /*
- * STM32F1xx drivers configuration.
+ * STM32F103 drivers configuration.

  * The following settings override the default settings present in
  * the various device driver implementation headers.
  * Note that the settings for each driver only have effect if the whole
@@ -65,9 +56,9 @@
 /*
  * ADC driver system settings.
  */
-#define STM32_ADC_USE_ADC1                  TRUE
+#define STM32_ADC_USE_ADC1                  FALSE

 #define STM32_ADC_ADC1_DMA_PRIORITY         2
-#define STM32_ADC_ADC1_IRQ_PRIORITY         5
+#define STM32_ADC_ADC1_IRQ_PRIORITY         6

 
 /*
  * CAN driver system settings.
@@ -111,16 +102,12 @@
  */
 #define STM32_I2C_USE_I2C1                  FALSE
 #define STM32_I2C_USE_I2C2                  FALSE
-#define STM32_I2C_USE_I2C3                  FALSE
-#define STM32_I2C_I2C1_IRQ_PRIORITY         10
-#define STM32_I2C_I2C2_IRQ_PRIORITY         10
-#define STM32_I2C_I2C3_IRQ_PRIORITY         10
-#define STM32_I2C_I2C1_DMA_PRIORITY         1
-#define STM32_I2C_I2C2_DMA_PRIORITY         1
-#define STM32_I2C_I2C3_DMA_PRIORITY         1
+#define STM32_I2C_I2C1_IRQ_PRIORITY         5

+#define STM32_I2C_I2C2_IRQ_PRIORITY         5

+#define STM32_I2C_I2C1_DMA_PRIORITY         3

+#define STM32_I2C_I2C2_DMA_PRIORITY         3

 #define STM32_I2C_I2C1_DMA_ERROR_HOOK()     chSysHalt()
 #define STM32_I2C_I2C2_DMA_ERROR_HOOK()     chSysHalt()
-#define STM32_I2C_I2C3_DMA_ERROR_HOOK()     chSysHalt()
 
 /*
  * ICU driver system settings.
@@ -168,13 +155,11 @@
 #define STM32_SERIAL_USE_USART3             FALSE
 #define STM32_SERIAL_USE_UART4              FALSE
 #define STM32_SERIAL_USE_UART5              FALSE
-#define STM32_SERIAL_USE_USART6             FALSE
 #define STM32_SERIAL_USART1_PRIORITY        12
 #define STM32_SERIAL_USART2_PRIORITY        12
 #define STM32_SERIAL_USART3_PRIORITY        12
 #define STM32_SERIAL_UART4_PRIORITY         12
 #define STM32_SERIAL_UART5_PRIORITY         12
-#define STM32_SERIAL_USART6_PRIORITY        12
 
 /*
  * SPI driver system settings.
@@ -207,7 +192,8 @@
 /*
  * USB driver system settings.
  */
-#define STM32_USB_USE_USB1                  TRUE
+#define STM32_USB_USE_USB1                  FALSE

 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
-#define STM32_USB_USB1_HP_IRQ_PRIORITY      6
+#define STM32_USB_USB1_HP_IRQ_PRIORITY      13

 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
+