X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Farm%2Fdrv%2Fadc_at91.h;h=07ef6a40927cd99e98d302d9f9ccb5036d006635;hb=ef59482dd1c7167b3cb5718572c42019cf16594b;hp=49f0de3197f987487a07204939da4b4f6b64a57e;hpb=211f1718bc7a3553323733eea821a477decf0cc7;p=bertos.git

diff --git a/bertos/cpu/arm/drv/adc_at91.h b/bertos/cpu/arm/drv/adc_at91.h
index 49f0de31..07ef6a40 100644
--- a/bertos/cpu/arm/drv/adc_at91.h
+++ b/bertos/cpu/arm/drv/adc_at91.h
@@ -41,10 +41,11 @@
 #ifndef DRV_ADC_AT91_H
 #define DRV_ADC_AT91_H
 
-#include <cfg/compiler.h>
+#include <hw/hw_cpufreq.h>
+
+#include "cfg/cfg_adc.h"
 
-#include "hw_cpu.h"
-#include "appconfig.h"
+#include <cfg/compiler.h>
 
 /**
  * ADC config define.
@@ -56,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)
 
@@ -68,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
 
@@ -89,5 +90,8 @@
 	do { \
 	} while (0)
 
+void adc_hw_select_ch(uint8_t ch);
+uint16_t adc_hw_read(void);
+void adc_hw_init(void);
 
 #endif /* DRV_ADC_AT91_H */