X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Farm%2Fdrv%2Fadc_at91.h;h=07ef6a40927cd99e98d302d9f9ccb5036d006635;hb=5e75e84ec8e806f7ded1207b395be2fb09a60a35;hp=5e9e7d26bc328339cbfb1f05fc5c378acdfc2a8c;hpb=0fbabc305e65dfc5538cfcae10c04f6be9daf657;p=bertos.git

diff --git a/bertos/cpu/arm/drv/adc_at91.h b/bertos/cpu/arm/drv/adc_at91.h
index 5e9e7d26..07ef6a40 100644
--- a/bertos/cpu/arm/drv/adc_at91.h
+++ b/bertos/cpu/arm/drv/adc_at91.h
@@ -41,9 +41,9 @@
 #ifndef DRV_ADC_AT91_H
 #define DRV_ADC_AT91_H
 
-#include "hw_cpu.h"
+#include <hw/hw_cpufreq.h>
 
-#include <cfg/cfg_adc.h>
+#include "cfg/cfg_adc.h"
 
 #include <cfg/compiler.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
 
@@ -90,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 */