From ee5f4545778c7712d0fcc0dfbd8c5b11a89d1027 Mon Sep 17 00:00:00 2001
From: pcirillo <pcirillo@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Sat, 1 Jun 2013 08:46:31 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5783
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 testhal/SPC563Mxx/ICU-PWM/halconf.h |  2 +-
 testhal/SPC563Mxx/ICU-PWM/main.c    | 53 +++++++++++++++++--------------------
 2 files changed, 25 insertions(+), 30 deletions(-)

(limited to 'testhal/SPC563Mxx')

diff --git a/testhal/SPC563Mxx/ICU-PWM/halconf.h b/testhal/SPC563Mxx/ICU-PWM/halconf.h
index 24462dafd..3a6d72910 100644
--- a/testhal/SPC563Mxx/ICU-PWM/halconf.h
+++ b/testhal/SPC563Mxx/ICU-PWM/halconf.h
@@ -128,7 +128,7 @@
  * @brief   Enables the SERIAL subsystem.
  */
 #if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)
-#define HAL_USE_SERIAL              TRUE
+#define HAL_USE_SERIAL              FALSE
 #endif
 
 /**
diff --git a/testhal/SPC563Mxx/ICU-PWM/main.c b/testhal/SPC563Mxx/ICU-PWM/main.c
index 60c451373..48e02d3f6 100644
--- a/testhal/SPC563Mxx/ICU-PWM/main.c
+++ b/testhal/SPC563Mxx/ICU-PWM/main.c
@@ -1,21 +1,21 @@
 /*
-    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.
-*/
+ * Licensed under ST Liberty SW License Agreement V2, (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.st.com/software_license_agreement_liberty_v2
+ *
+ * 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"
-#include "hal.h"
+/* Inclusion of the main header files of all the imported components in the
+   order specified in the application wizard. The file is generated
+   automatically.*/
+#include "components.h"
 
 static void pwmpcb(PWMDriver *pwmp) {
 
@@ -30,8 +30,8 @@ static void pwmc1cb(PWMDriver *pwmp) {
 }
 
 static PWMConfig pwmcfg = {
-  80000,                                    /* 80kHz PWM clock frequency.*/
-  20000,                                    /* Initial PWM period 0.25s.*/
+  100000,                                   /* 100kHz PWM clock frequency.*/
+  20000,                                    /* Initial PWM period 0.2s.*/
   pwmpcb,
   {
    {PWM_OUTPUT_ACTIVE_HIGH, pwmc1cb}
@@ -40,7 +40,6 @@ static PWMConfig pwmcfg = {
 };
 
 icucnt_t last_width, last_period;
-icucnt_t last_width2, last_period2;
 
 static void icuwidthcb(ICUDriver *icup) {
 
@@ -56,7 +55,7 @@ static void icuperiodcb(ICUDriver *icup) {
 
 static ICUConfig icucfg = {
   ICU_INPUT_ACTIVE_HIGH,
-  80000,                                    /* 80kHz ICU clock frequency.*/
+  100000,                                   /* 100kHz ICU clock frequency.*/
   icuwidthcb,
   icuperiodcb,
   NULL
@@ -67,15 +66,11 @@ static ICUConfig icucfg = {
  */
 int main(void) {
 
-  /*
-   * System initializations.
-   * - HAL initialization, this also initializes the configured device drivers
-   *   and performs the board-specific initializations.
-   * - Kernel initialization, the main() function becomes a thread and the
-   *   RTOS is active.
-   */
-  halInit();
-  chSysInit();
+  /* Initialization of all the imported components in the order specified in
+	 the application wizard. The function is generated automatically.*/
+  componentsInit();
+
+  palClearPad(PORT11, P11_LED4);
 
   /*
    * Initializes the PWM driver 8 and ICU driver 1.
-- 
cgit v1.2.3