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

3 files changed, 70 insertions, 30 deletions

diff --git a/os/halnew/platforms/common/ARMCMx/nvic.c b/os/halnew/platforms/common/ARMCMx/nvic.c
index e5fa7591a..20bf60035 100644
--- a/os/halnew/platforms/common/ARMCMx/nvic.c
+++ b/os/halnew/platforms/common/ARMCMx/nvic.c
@@ -1,21 +1,17 @@
 /*

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

-                 2011,2012,2013 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/>.

+    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.

 */

 

 /**

@@ -28,6 +24,30 @@
 

 #include "hal.h"

 

+/*===========================================================================*/

+/* Driver local definitions.                                                 */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Driver exported variables.                                                */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Driver local types.                                                       */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Driver local variables.                                                   */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Driver local functions.                                                   */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Driver exported functions.                                                */

+/*===========================================================================*/

+

 /**

  * @brief   Sets the priority of an interrupt handler and enables it.

  * @note    The parameters are not tested for correctness.

diff --git a/os/halnew/platforms/common/ARMCMx/nvic.h b/os/halnew/platforms/common/ARMCMx/nvic.h
index f945eee74..b9fa905b1 100644
--- a/os/halnew/platforms/common/ARMCMx/nvic.h
+++ b/os/halnew/platforms/common/ARMCMx/nvic.h
@@ -1,21 +1,17 @@
 /*

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

-                 2011,2012,2013 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/>.

+    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.

 */

 

 /**

@@ -29,11 +25,35 @@
 #ifndef _NVIC_H_

 #define _NVIC_H_

 

+/*===========================================================================*/

+/* Driver constants.                                                         */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Driver pre-compile time settings.                                         */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Derived constants and error checks.                                       */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Driver data structures and types.                                         */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Driver macros.                                                            */

+/*===========================================================================*/

+

 /**

  * @brief   Priority level to priority mask conversion macro.

  */

 #define NVIC_PRIORITY_MASK(prio) ((prio) << (8 - __NVIC_PRIO_BITS))

 

+/*===========================================================================*/

+/* External declarations.                                                    */

+/*===========================================================================*/

+

 #ifdef __cplusplus

 extern "C" {

 #endif

diff --git a/os/kernel/ports/ARMCMx/chcore_v7m.h b/os/kernel/ports/ARMCMx/chcore_v7m.h
index cf1f04d08..10b5faf83 100644
--- a/os/kernel/ports/ARMCMx/chcore_v7m.h
+++ b/os/kernel/ports/ARMCMx/chcore_v7m.h
@@ -398,10 +398,10 @@ struct context {
 extern "C" {

 #endif

   void _port_irq_epilogue(void);

-  void _port_switch_from_isr(void);

-  void _port_exit_from_isr(void);

   void _port_switch(thread_t *ntp, thread_t *otp);

   void _port_thread_start(void);

+  void _port_switch_from_isr(void);

+  void _port_exit_from_isr(void);

 #ifdef __cplusplus

 }

 #endif