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>

1 files changed, 3 insertions, 6 deletions

diff --git a/src/simulator/gpio.c b/src/simulator/gpio.c
index 6e89f946..569f4b78 100644
--- a/src/simulator/gpio.c
+++ b/src/simulator/gpio.c
@@ -27,17 +27,14 @@ void gpio_pwm_write(struct gpio_pwm g, uint8_t val) {
 struct gpio_adc gpio_adc_setup(uint8_t pin) {
     return (struct gpio_adc){.pin=pin};
 }
-uint32_t gpio_adc_sample_time(void) {
+uint32_t gpio_adc_sample(struct gpio_adc g) {
     return 0;
 }
-uint8_t gpio_adc_sample(struct gpio_adc g) {
-    return 0;
-}
-void gpio_adc_clear_sample(struct gpio_adc g) {
-}
 uint16_t gpio_adc_read(struct gpio_adc g) {
     return 0;
 }
+void gpio_adc_cancel_sample(struct gpio_adc g) {
+}
 
 void spi_config(void) {
 }