Skip to content
Snippets Groups Projects
Commit 624738ca authored by Damien George's avatar Damien George
Browse files

extmod/machine_i2c: Allow mp_hal_pin_obj_t to be any type, not a ptr.

parent 109990fc
Branches
No related tags found
No related merge requests found
...@@ -63,7 +63,7 @@ void ets_event_poll(void); ...@@ -63,7 +63,7 @@ void ets_event_poll(void);
#include "etshal.h" #include "etshal.h"
#include "gpio.h" #include "gpio.h"
#include "esp8266/modpyb.h" #include "esp8266/modpyb.h"
#define mp_hal_pin_obj_t pyb_pin_obj_t #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_get_pin_obj(o) mp_obj_get_pin_obj(o)
#define mp_hal_pin_config_od(p) do { \ #define mp_hal_pin_config_od(p) do { \
ETS_GPIO_INTR_DISABLE(); \ ETS_GPIO_INTR_DISABLE(); \
......
...@@ -37,8 +37,8 @@ ...@@ -37,8 +37,8 @@
typedef struct _machine_i2c_obj_t { typedef struct _machine_i2c_obj_t {
mp_obj_base_t base; mp_obj_base_t base;
uint32_t us_delay; uint32_t us_delay;
mp_hal_pin_obj_t *scl; mp_hal_pin_obj_t scl;
mp_hal_pin_obj_t *sda; mp_hal_pin_obj_t sda;
} machine_i2c_obj_t; } machine_i2c_obj_t;
STATIC void mp_hal_i2c_delay(machine_i2c_obj_t *self) { STATIC void mp_hal_i2c_delay(machine_i2c_obj_t *self) {
......
...@@ -43,7 +43,7 @@ void mp_hal_set_interrupt_char(int c); // -1 to disable ...@@ -43,7 +43,7 @@ void mp_hal_set_interrupt_char(int c); // -1 to disable
// C-level pin HAL // C-level pin HAL
#include "stmhal/pin.h" #include "stmhal/pin.h"
#define mp_hal_pin_obj_t pin_obj_t #define mp_hal_pin_obj_t pin_obj_t*
#define mp_hal_get_pin_obj(o) (pin_obj_t*)pin_find(o) #define mp_hal_get_pin_obj(o) (pin_obj_t*)pin_find(o)
#define mp_hal_pin_config_od(p) mp_hal_gpio_config((p)->gpio, (p)->pin, 5, 0, 0) #define mp_hal_pin_config_od(p) mp_hal_gpio_config((p)->gpio, (p)->pin, 5, 0, 0)
#define mp_hal_pin_low(p) GPIO_clear_pin((p)->gpio, (p)->pin_mask) #define mp_hal_pin_low(p) GPIO_clear_pin((p)->gpio, (p)->pin_mask)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment