switched to chibios 2.6.0

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

2 files changed, 23 insertions, 62 deletions

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)