Rafactor ARM modules to be compiled explicitly (without C file stub).

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@2604 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/bertos/cpu/arm/drv/adc_arm.c b/bertos/cpu/arm/drv/adc_arm.c
index 788785515ff9bc11f73c6de5fe0c3dcf635268cb..f2906721e32ae8254bb2922e62e11f93ae390f6f 100644 (file)
--- a/bertos/cpu/arm/drv/adc_arm.c
+++ b/bertos/cpu/arm/drv/adc_arm.c
@@ -37,13 +37,21 @@
  *
  * \author Daniele Basile <asterix@develer.com>
  *
+ * This module is automatically included so no need to include
+ * in test list.
+ * notest: arm
+ *
  */
 
-#include <cpu/detect.h>
+#ifndef WIZ_AUTOGEN
+       #warning This file is deprecated, you should use adc_at91.c
+
+       #include <cpu/detect.h>
 
-#if CPU_ARM_AT91
-       #include "adc_at91.c"
-/*#elif  Add other ARM families here */
-#else
-       #error Unknown CPU
-#endif
+       #if CPU_ARM_AT91
+               #include "adc_at91.c"
+       /*#elif  Add other ARM families here */
+       #else
+               #error Unknown CPU
+       #endif
+#endif  /* WIZ_AUTOGEN */

diff --git a/bertos/cpu/arm/drv/pwm_arm.c b/bertos/cpu/arm/drv/pwm_arm.c
index d643739ce9b4df752a254fea1b390ecfb1bf5d6d..77a6a68be6c989b6a932f04272b5ff4a31973157 100644 (file)
--- a/bertos/cpu/arm/drv/pwm_arm.c
+++ b/bertos/cpu/arm/drv/pwm_arm.c
@@ -36,17 +36,21 @@
  *
  * \author Daniele Basile <asterix@develer.com>
  *
- * This module is automatically included so no need to include 
+ * This module is automatically included so no need to include
  * in test list.
  * notest: arm
  *
  */
 
-#include <cpu/detect.h>
+#ifndef WIZ_AUTOGEN
+       #warning This file is deprecated, you should use pwm_at91.c
 
-#if CPU_ARM_AT91
-       #include "pwm_at91.c"
-/*#elif  Add other ARM families here */
-#else
-       #error Unknown CPU
-#endif
+       #include <cpu/detect.h>
+
+       #if CPU_ARM_AT91
+               #include "pwm_at91.c"
+       /*#elif  Add other ARM families here */
+       #else
+               #error Unknown CPU
+       #endif
+#endif  /* WIZ_AUTOGEN */
\ No newline at end of file

diff --git a/bertos/cpu/arm/drv/ser_arm.c b/bertos/cpu/arm/drv/ser_arm.c
index 7f7e7f9f4d7f932c80fe5be0f073707df6fd005c..44cb894df1b2dcf8e98e72a9670127a3f5e46228 100644 (file)
--- a/bertos/cpu/arm/drv/ser_arm.c
+++ b/bertos/cpu/arm/drv/ser_arm.c
@@ -36,17 +36,21 @@
  *
  * \author Daniele Basile <asterix@develer.com>
  *
- * This module is automatically included so no need to include 
+ * This module is automatically included so no need to include
  * in test list.
  * notest: arm
  *
  */
 
-#include <cpu/detect.h>
+#ifndef WIZ_AUTOGEN
+       #warning This file is deprecated, you should use ser_at91.c
 
-#if CPU_ARM_AT91
-       #include "ser_at91.c"
-/*#elif  Add other ARM families here */
-#else
-       #error Unknown CPU
-#endif
+       #include <cpu/detect.h>
+
+       #if CPU_ARM_AT91
+               #include "ser_at91.c"
+       /*#elif  Add other ARM families here */
+       #else
+               #error Unknown CPU
+       #endif
+#endif /* WIZ_AUTOGEN */

diff --git a/bertos/cpu/arm/drv/stepper_arm.c b/bertos/cpu/arm/drv/stepper_arm.c
index a51abf842e6b120cd59a8161fc5344303bd45036..485a39036b00297b79e5ed78d2306275c2fcda01 100644 (file)
--- a/bertos/cpu/arm/drv/stepper_arm.c
+++ b/bertos/cpu/arm/drv/stepper_arm.c
@@ -36,16 +36,19 @@
  *
  * \author Daniele Basile <asterix@develer.com>
  *
- * This module is automatically included so no need to include 
+ * This module is automatically included so no need to include
  * in test list.
  * notest: arm
  */
+#ifndef WIZ_AUTOGEN
+       #warning This file is deprecated, you should use stepper_at91.c
 
-#include <cpu/detect.h>
+       #include <cpu/detect.h>
 
-#if CPU_ARM_AT91
-       #include "stepper_at91.c"
-/*#elif  Add other ARM families here */
-#else
-       #error Unknown CPU
-#endif
+       #if CPU_ARM_AT91
+               #include "stepper_at91.c"
+       /*#elif  Add other ARM families here */
+       #else
+               #error Unknown CPU
+       #endif
+#endif /* WIZ_AUTOGEN */
\ No newline at end of file

diff --git a/bertos/cpu/arm/drv/timer_arm.c b/bertos/cpu/arm/drv/timer_arm.c
index b6f4d845f1db8c7fee2e6b21e82c46da5e922185..adeee6f6a6dd1b3504322831647e8b24aa36482e 100644 (file)
--- a/bertos/cpu/arm/drv/timer_arm.c
+++ b/bertos/cpu/arm/drv/timer_arm.c
@@ -35,18 +35,23 @@
  * \author Francesco Sacchi <batt@develer.com>
  *
  * \brief Low-level timer module for ARM (inplementation).
+ *
+ * This module is automatically included so no need to include
+ * in test list.
+ * notest: arm
  */
 
-#include <cpu/detect.h>
-#include <cfg/cfg_arch.h>
+#ifndef WIZ_AUTOGEN
+       #warning This file is deprecated, you should use timer_at91.c
 
-#if !(ARCH & ARCH_NIGHTTEST)
+       #include <cpu/detect.h>
+       #include <cfg/cfg_arch.h>
 
-#if CPU_ARM_AT91
-       #include "timer_at91.c"
-/*#elif  Add other ARM families here */
-#else
-       #error Unknown CPU
-#endif
+       #if CPU_ARM_AT91
+               #include "timer_at91.c"
+       /*#elif  Add other ARM families here */
+       #else
+               #error Unknown CPU
+       #endif
 
-#endif /* (ARCH & ARCH_NIGHTLYTEST) */
+#endif /* WIZ_AUTOGEN */

diff --git a/bertos/cpu/arm/drv/twi_arm.c b/bertos/cpu/arm/drv/twi_arm.c
index 5a3cbe1ca2125cdf08f1957cdb554e51aabfba95..8395f392cf0b55ef9edaa6123b674425a671ce9c 100644 (file)
--- a/bertos/cpu/arm/drv/twi_arm.c
+++ b/bertos/cpu/arm/drv/twi_arm.c
@@ -36,17 +36,21 @@
  *
  * \author Daniele Basile <asterix@develer.com>
  *
- * This module is automatically included so no need to include 
+ * This module is automatically included so no need to include
  * in test list.
  * notest: arm
  *
  */
 
-#include <cpu/detect.h>
+#ifndef WIZ_AUTOGEN
+       #warning This file is deprecated, you should use twi_at91.c
 
-#if CPU_ARM_AT91
-       #include "twi_at91.c"
-/*#elif  Add other ARM families here */
-#else
-       #error Unknown CPU
-#endif
+       #include <cpu/detect.h>
+
+       #if CPU_ARM_AT91
+               #include "twi_at91.c"
+       /*#elif  Add other ARM families here */
+       #else
+               #error Unknown CPU
+       #endif
+#endif /* WIZ_AUTOGEN */

diff --git a/wizard/mktemplates/template.mk b/wizard/mktemplates/template.mk
index a411a81506a43dec059ff54587c0ad066d8020f9..9d7dabceed561e73373caf5c671e77e3dcc48671 100644 (file)
--- a/wizard/mktemplates/template.mk
+++ b/wizard/mktemplates/template.mk
@@ -83,7 +83,7 @@ $pname_ASRC = $($pname_WIZARD_ASRC) $($pname_USER_ASRC)
 
 $pname_CFLAGS = $cflags
 $pname_LDFLAGS = $ldflags
-$pname_CPPFLAGS = -D'CPU_FREQ=($cpuclockfreqUL)' -D'ARCH=(ARCH_DEFAULT)' $cppflags -I$pname/
+$pname_CPPFLAGS = -D'CPU_FREQ=($cpuclockfreqUL)' -D'ARCH=(ARCH_DEFAULT)' -D'WIZ_AUTOGEN' -I$pname/ $cppflags
 $pname_CPPAFLAGS = $cppaflags
 $pname_CXXFLAGS = $cxxflags
 $pname_ASFLAGS = $asflags