From 7c8addc5c5f811eefbed901fcd182a3012e2e75b Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Wed, 2 Nov 2016 17:30:34 -0400 Subject: gpio: Merge gpio_adc_sample_time() into gpio_adc_sample() Return the number of clock ticks to wait directly from gpio_adc_sample(). This simplifies the ADC interface. Signed-off-by: Kevin O'Connor --- src/avr/gpio.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/avr/gpio.h') diff --git a/src/avr/gpio.h b/src/avr/gpio.h index e6cbbd32..4eb37204 100644 --- a/src/avr/gpio.h +++ b/src/avr/gpio.h @@ -2,7 +2,6 @@ #define __AVR_GPIO_H #include -#include "compiler.h" // __always_inline struct gpio_out { struct gpio_digital_regs *regs; @@ -31,10 +30,9 @@ struct gpio_adc { uint8_t chan; }; struct gpio_adc gpio_adc_setup(uint8_t pin); -uint32_t gpio_adc_sample_time(void); -uint8_t gpio_adc_sample(struct gpio_adc g); -void gpio_adc_clear_sample(struct gpio_adc g); +uint32_t gpio_adc_sample(struct gpio_adc g); uint16_t gpio_adc_read(struct gpio_adc g); +void gpio_adc_cancel_sample(struct gpio_adc g); void spi_config(void); void spi_transfer(char *data, uint8_t len); -- cgit v1.2.3-70-g09d2