diff options
| author | Damien George <damien.p.george@gmail.com> | 2016-04-22 10:04:12 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2016-04-22 10:04:12 +0100 |
| commit | a2d5d84ecca175fbfbf42e892d6376efd08758eb (patch) | |
| tree | 5d382b3ba3bf0c489f90577e3401f4a701b532da /esp8266/esp_mphal.h | |
| parent | 624738ca64c71c8f2cccced3fb5d2380bb4ae56b (diff) | |
esp8266: Convert mp_hal_pin_obj_t from pin ptr to simple integer.
Most pin I/O can be done just knowing the pin number as a simple
integer, and it's more efficient this way (code size, speed) because it
doesn't require a memory lookup to get the pin id from the pin object.
If the full pin object is needed then it can be easily looked up in the
pin table.
Diffstat (limited to 'esp8266/esp_mphal.h')
| -rw-r--r-- | esp8266/esp_mphal.h | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/esp8266/esp_mphal.h b/esp8266/esp_mphal.h index 39cf60ab1..4dca17d0a 100644 --- a/esp8266/esp_mphal.h +++ b/esp8266/esp_mphal.h @@ -63,20 +63,11 @@ void ets_event_poll(void); #include "etshal.h" #include "gpio.h" #include "esp8266/modpyb.h" -#define mp_hal_pin_obj_t pyb_pin_obj_t* -#define mp_hal_get_pin_obj(o) mp_obj_get_pin_obj(o) -#define mp_hal_pin_config_od(p) do { \ - ETS_GPIO_INTR_DISABLE(); \ - PIN_FUNC_SELECT((p)->periph, (p)->func); \ - GPIO_REG_WRITE(GPIO_PIN_ADDR(GPIO_ID_PIN((p)->phys_port)), \ - GPIO_REG_READ(GPIO_PIN_ADDR(GPIO_ID_PIN((p)->phys_port))) \ - | GPIO_PIN_PAD_DRIVER_SET(GPIO_PAD_DRIVER_ENABLE)); /* open drain */ \ - GPIO_REG_WRITE(GPIO_ENABLE_ADDRESS, \ - GPIO_REG_READ(GPIO_ENABLE_ADDRESS) | (1 << (p)->phys_port)); \ - ETS_GPIO_INTR_ENABLE(); \ - } while (0) -#define mp_hal_pin_low(p) gpio_output_set(0, 1 << (p)->phys_port, 1 << (p)->phys_port, 0) -#define mp_hal_pin_od_high(p) gpio_output_set(1 << (p)->phys_port, 0, 1 << (p)->phys_port, 0) -#define mp_hal_pin_read(p) GPIO_INPUT_GET(GPIO_ID_PIN((p)->phys_port)) +#define mp_hal_pin_obj_t uint32_t +#define mp_hal_get_pin_obj(o) mp_obj_get_pin(o) +void mp_hal_pin_config_od(mp_hal_pin_obj_t pin); +#define mp_hal_pin_low(p) gpio_output_set(0, 1 << (p), 1 << (p), 0) +#define mp_hal_pin_od_high(p) gpio_output_set(1 << (p), 0, 1 << (p), 0) +#define mp_hal_pin_read(p) GPIO_INPUT_GET(GPIO_ID_PIN((p))) #endif // _INCLUDED_MPHAL_H_ |