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

6 files changed, 230 insertions, 29 deletions

diff --git a/os/hal/boards/ST_EVB_SPC56EL/board.c b/os/hal/boards/ST_EVB_SPC56EL/board.c
index 87e967e1b..721f452e3 100644
--- a/os/hal/boards/ST_EVB_SPC56EL/board.c
+++ b/os/hal/boards/ST_EVB_SPC56EL/board.c
@@ -56,7 +56,7 @@ const PALConfig pal_default_config = {
  */

 void __early_init(void) {

 

-  spc_early_init();

+  spc_clock_init();

 }

 

 /*

diff --git a/os/hal/templates/osal.c b/os/hal/templates/osal.c
index 5ef8869e7..4ccb1cc2e 100644
--- a/os/hal/templates/osal.c
+++ b/os/hal/templates/osal.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.

 */

 

 /**

diff --git a/os/hal/templates/osal.h b/os/hal/templates/osal.h
index 1510c97b7..c99fb44a3 100644
--- a/os/hal/templates/osal.h
+++ b/os/hal/templates/osal.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.

 */

 

 /**

diff --git a/os/hal/templates/st_lld.c b/os/hal/templates/st_lld.c
new file mode 100644
index 000000000..6e77aa5fa
--- /dev/null
+++ b/os/hal/templates/st_lld.c
@@ -0,0 +1,67 @@
+/*

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

+

+    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

+

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

+

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

+*/

+

+/**

+ * @file    PLATFORM/st_lld.c

+ * @brief   ST Driver subsystem low level driver code.

+ *

+ * @addtogroup ST

+ * @{

+ */

+

+#include "hal.h"

+

+#if (OSAL_ST_MODE != OSAL_ST_MODE_NONE) || defined(__DOXYGEN__)

+

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

+/* Driver local definitions.                                                 */

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

+

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

+/* Driver exported variables.                                                */

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

+

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

+/* Driver local types.                                                       */

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

+

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

+/* Driver local variables and types.                                         */

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

+

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

+/* Driver local functions.                                                   */

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

+

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

+/* Driver interrupt handlers.                                                */

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

+

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

+/* Driver exported functions.                                                */

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

+

+/**

+ * @brief   Low level ST driver initialization.

+ *

+ * @notapi

+ */

+void st_lld_init(void) {

+}

+

+#endif /* OSAL_ST_MODE != OSAL_ST_MODE_NONE */

+

+/** @} */

diff --git a/os/hal/templates/st_lld.h b/os/hal/templates/st_lld.h
new file mode 100644
index 000000000..dd743af51
--- /dev/null
+++ b/os/hal/templates/st_lld.h
@@ -0,0 +1,141 @@
+/*

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

+

+    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

+

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

+

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

+*/

+

+/**

+ * @file    PLATFORM/st_lld.h

+ * @brief   ST Driver subsystem low level driver header.

+ * @details This header is designed to be include-able without having to

+ *          include other files from the HAL.

+ *

+ * @addtogroup ST

+ * @{

+ */

+

+#ifndef _ST_LLD_H_

+#define _ST_LLD_H_

+

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

+/* Driver constants.                                                         */

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

+

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

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

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

+

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

+/* Derived constants and error checks.                                       */

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

+

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

+/* Driver data structures and types.                                         */

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

+

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

+/* Driver macros.                                                            */

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

+

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

+/* External declarations.                                                    */

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

+

+#ifdef __cplusplus

+extern "C" {

+#endif

+  void st_lld_init(void);

+#ifdef __cplusplus

+}

+#endif

+

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

+/* Driver inline functions.                                                  */

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

+

+/**

+ * @brief   Returns the time counter value.

+ *

+ * @return              The counter value.

+ *

+ * @notapi

+ */

+static inline systime_t st_lld_get_counter(void) {

+

+  return (systime_t)0;

+}

+

+/**

+ * @brief   Starts the alarm.

+ * @note    Makes sure that no spurious alarms are triggered after

+ *          this call.

+ *

+ * @param[in] time      the time to be set for the first alarm

+ *

+ * @notapi

+ */

+static inline void st_lld_start_alarm(systime_t time) {

+

+  (void)time;

+}

+

+/**

+ * @brief   Stops the alarm interrupt.

+ *

+ * @notapi

+ */

+static inline void st_lld_stop_alarm(void) {

+

+}

+

+/**

+ * @brief   Sets the alarm time.

+ *

+ * @param[in] time      the time to be set for the next alarm

+ *

+ * @notapi

+ */

+static inline void st_lld_set_alarm(systime_t time) {

+

+  (void)time;

+}

+

+/**

+ * @brief   Returns the current alarm time.

+ *

+ * @return              The currently set alarm time.

+ *

+ * @notapi

+ */

+static inline systime_t st_lld_get_alarm(void) {

+

+  return (systime_t)0;

+}

+

+/**

+ * @brief   Determines if the alarm is active.

+ *

+ * @return              The alarm status.

+ * @retval false        if the alarm is not active.

+ * @retval true         is the alarm is active

+ *

+ * @notapi

+ */

+static inline bool st_lld_is_alarm_active(void) {

+

+  return false;

+}

+

+#endif /* _ST_LLD_H_ */

+

+/** @} */

diff --git a/os/rt/osal/osal.h b/os/rt/osal/osal.h
index 868fca249..c26b9853d 100644
--- a/os/rt/osal/osal.h
+++ b/os/rt/osal/osal.h
@@ -136,6 +136,7 @@ typedef io_queue_t GenericQueue;
 typedef input_queue_t InputQueue;

 typedef output_queue_t OutputQueue;

 typedef bool bool_t;

+#define OSAL_FREQUENCY OSAL_ST_FREQUENCY

 

 #if 0

 /**