Add full support for AT91SAM7S64, AT91SAM7S128, AT91SAM7S512, AT91SAM7X512.

[bertos.git] / bertos / cpu / arm / drv / adc_at91.h

diff --git a/bertos/cpu/arm/drv/adc_at91.h b/bertos/cpu/arm/drv/adc_at91.h
index fb0ec1d64aad65047137b64f7db3dae84fd10b2d..f1125980623afe10d47fe8dedacbf7514c8e2d43 100644 (file)
--- a/bertos/cpu/arm/drv/adc_at91.h
+++ b/bertos/cpu/arm/drv/adc_at91.h
@@ -41,7 +41,7 @@
 #ifndef DRV_ADC_AT91_H
 #define DRV_ADC_AT91_H
 
-#include "hw/hw_cpu.h"
+#include <hw/hw_cpufreq.h>
 
 #include "cfg/cfg_adc.h"
 
@@ -57,7 +57,7 @@
  * Macro for computing correct value to write into ADC
  * register.
  */
-#define ADC_COMPUTED_PRESCALER    ((CLOCK_FREQ/(2 * CONFIG_ADC_CLOCK)) - 1)
+#define ADC_COMPUTED_PRESCALER    ((CPU_FREQ/(2 * CONFIG_ADC_CLOCK)) - 1)
 #define ADC_COMPUTED_STARTUPTIME  (((CONFIG_ADC_STARTUP_TIME * CONFIG_ADC_CLOCK)/ 8000000UL) - 1)
 #define ADC_COMPUTED_SHTIME       (((CONFIG_ADC_SHTIME * CONFIG_ADC_CLOCK)/1000000000UL) - 1)
 
@@ -69,11 +69,11 @@
  * Define PIO controller for enable ADC function.
  * \{
  */
-#if CPU_ARM_AT91SAM7X256
+#if CPU_ARM_SAM7X
        #define ADC_PIO_DISABLE           PIOB_PDR
        #define ADC_PIO_EN_FUNC           PIOB_ASR
 
-#elif CPU_ARM_AT91SAM7S256
+#elif CPU_ARM_SAM7S_LARGE
        #define ADC_PIO_DISABLE           PIOA_PDR
        #define ADC_PIO_EN_FUNC           PIOA_BSR