djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Damien George 2016-04-22 09:56:02 +01:00
parent 109990fc32
commit 624738ca64
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
esp8266/esp_mphal.h
View File

@ -63,7 +63,7 @@ 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_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(); \

4
extmod/machine_i2c.c
View File

@ -37,8 +37,8 @@
typedef struct _machine_i2c_obj_t {
mp_obj_base_t base;
uint32_t us_delay;
mp_hal_pin_obj_t *scl;
mp_hal_pin_obj_t *sda;
mp_hal_pin_obj_t scl;
mp_hal_pin_obj_t sda;
} machine_i2c_obj_t;
STATIC void mp_hal_i2c_delay(machine_i2c_obj_t *self) {

2
stmhal/mphalport.h
View File

@ -43,7 +43,7 @@ void mp_hal_set_interrupt_char(int c); // -1 to disable
// C-level pin HAL
#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_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)