aboutsummaryrefslogtreecommitdiffstats
path: root/src/avr/gpio.h
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2016-11-02 17:30:34 -0400
committerKevin O'Connor <kevin@koconnor.net>2016-11-02 17:36:43 -0400
commit7c8addc5c5f811eefbed901fcd182a3012e2e75b (patch)
treeede85b870f54cbc0f8e85f102d041e63d1de41c0 /src/avr/gpio.h
parent5419c456ace6623df45fa5089a477492ff5b5758 (diff)
downloadkutter-7c8addc5c5f811eefbed901fcd182a3012e2e75b.tar.gz
kutter-7c8addc5c5f811eefbed901fcd182a3012e2e75b.tar.xz
kutter-7c8addc5c5f811eefbed901fcd182a3012e2e75b.zip
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 <kevin@koconnor.net>
Diffstat (limited to 'src/avr/gpio.h')
-rw-r--r--src/avr/gpio.h6
1 files changed, 2 insertions, 4 deletions
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 <stdint.h>
-#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);