From 1ea633c484a78a2d42168f03f46c4a28d9da2f65 Mon Sep 17 00:00:00 2001 From: arturo182 Date: Sun, 8 Jul 2018 12:49:39 +0200 Subject: [PATCH] nrf: mphalport cleanup --- ports/nrf/mphalport.h | 48 +++++++++---------------------------------- 1 file changed, 10 insertions(+), 38 deletions(-) diff --git a/ports/nrf/mphalport.h b/ports/nrf/mphalport.h index 3334fd7fe9..01a37a3b31 100644 --- a/ports/nrf/mphalport.h +++ b/ports/nrf/mphalport.h @@ -27,53 +27,25 @@ #ifndef __NRF52_HAL #define __NRF52_HAL -#include "py/mpconfig.h" +#include +#include + +#include "hal_gpio.h" +#include "lib/utils/interrupt_char.h" +#include "nrf.h" #include NRF5_HAL_H #include "pin.h" -#include "hal_gpio.h" +#include "py/mpconfig.h" -#include "lib/oofatfs/ff.h" +extern volatile uint64_t ticks_ms; -typedef enum -{ - HAL_OK = 0x00, - HAL_ERROR = 0x01, - HAL_BUSY = 0x02, - HAL_TIMEOUT = 0x03 -} HAL_StatusTypeDef; - -extern FIL* boot_output_file; - -static inline uint32_t hal_tick_fake(void) { - return 0; +static inline mp_uint_t mp_hal_ticks_ms(void) { + return ticks_ms; } -#define mp_hal_ticks_ms hal_tick_fake // TODO: implement. Right now, return 0 always - -extern const unsigned char mp_hal_status_to_errno_table[4]; - -NORETURN void mp_hal_raise(HAL_StatusTypeDef status); -void mp_hal_set_interrupt_char(int c); // -1 to disable - int mp_hal_stdin_rx_chr(void); void mp_hal_stdout_tx_str(const char *str); bool mp_hal_stdin_any(void); -#define mp_hal_pin_obj_t const pin_obj_t* -#define mp_hal_get_pin_obj(o) pin_find(o) -#define mp_hal_pin_high(p) hal_gpio_pin_high(p) -#define mp_hal_pin_low(p) hal_gpio_pin_low(p) -#define mp_hal_pin_read(p) hal_gpio_pin_read(p) -#define mp_hal_pin_write(p, v) do { if (v) { mp_hal_pin_high(p); } else { mp_hal_pin_low(p); } } while (0) -#define mp_hal_pin_od_low(p) mp_hal_pin_low(p) -#define mp_hal_pin_od_high(p) mp_hal_pin_high(p) -#define mp_hal_pin_open_drain(p) hal_gpio_cfg_pin(p->port, p->pin, HAL_GPIO_MODE_INPUT, HAL_GPIO_PULL_DISABLED) - - -// TODO: empty implementation for now. Used by machine_spi.c:69 -#define mp_hal_delay_us_fast(p) -#define mp_hal_ticks_us() (0) -#define mp_hal_ticks_cpu() (0) - #endif