mirrors
/
micropython
mirror of https://github.com/micropython/micropython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

esp8266/machine_spi: Rename machine_hspi to machine_spi. 

This renames the type, functions and file to match other ports.

Signed-off-by: Damien George <damien@micropython.org>
This commit is contained in:
Damien George 2023-11-23 15:21:34 +11:00
parent c554df57f6
commit 911662cc10
5 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/esp8266/Makefile
View File

@ -114,7 +114,7 @@ SRC_C = \
machine_bitstream.c \ machine_bitstream.c \
machine_pin.c \ machine_pin.c \
machine_rtc.c \ machine_rtc.c \
machine_hspi.c \ machine_spi.c \
modesp.c \ modesp.c \
network_wlan.c \ network_wlan.c \
ets_alt_task.c \ ets_alt_task.c \

1
ports/esp8266/boards/esp8266_common.ld
View File

@ -161,7 +161,6 @@ SECTIONS
*modmachine.o(.literal*, .text*) *modmachine.o(.literal*, .text*)
*machine_wdt.o(.literal*, .text*) *machine_wdt.o(.literal*, .text*)
*machine_spi.o(.literal*, .text*) *machine_spi.o(.literal*, .text*)
*machine_hspi.o(.literal*, .text*)
*hspi.o(.literal*, .text*) *hspi.o(.literal*, .text*)
*modesp.o(.literal* .text*) *modesp.o(.literal* .text*)
*modespnow.o(.literal* .text*) *modespnow.o(.literal* .text*)

34
ports/esp8266/machine_hspi.c → ports/esp8266/machine_spi.c
View File

@ -41,14 +41,14 @@
#if MICROPY_PY_MACHINE_SPI #if MICROPY_PY_MACHINE_SPI
typedef struct _machine_hspi_obj_t { typedef struct _machine_spi_obj_t {
mp_obj_base_t base; mp_obj_base_t base;
uint32_t baudrate; uint32_t baudrate;
uint8_t polarity; uint8_t polarity;
uint8_t phase; uint8_t phase;
} machine_hspi_obj_t; } machine_spi_obj_t;
STATIC void machine_hspi_transfer(mp_obj_base_t *self_in, size_t len, const uint8_t *src, uint8_t *dest) { STATIC void machine_spi_transfer(mp_obj_base_t *self_in, size_t len, const uint8_t *src, uint8_t *dest) {
(void)self_in; (void)self_in;
if (dest == NULL) { if (dest == NULL) {
@ -94,14 +94,14 @@ STATIC void machine_hspi_transfer(mp_obj_base_t *self_in, size_t len, const uint
/******************************************************************************/ /******************************************************************************/
// MicroPython bindings for HSPI // MicroPython bindings for HSPI
STATIC void machine_hspi_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) { STATIC void machine_spi_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
machine_hspi_obj_t *self = MP_OBJ_TO_PTR(self_in); machine_spi_obj_t *self = MP_OBJ_TO_PTR(self_in);
mp_printf(print, "HSPI(id=1, baudrate=%u, polarity=%u, phase=%u)", mp_printf(print, "HSPI(id=1, baudrate=%u, polarity=%u, phase=%u)",
self->baudrate, self->polarity, self->phase); self->baudrate, self->polarity, self->phase);
} }
STATIC void machine_hspi_init(mp_obj_base_t *self_in, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { STATIC void machine_spi_init(mp_obj_base_t *self_in, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
machine_hspi_obj_t *self = (machine_hspi_obj_t *)self_in; machine_spi_obj_t *self = (machine_spi_obj_t *)self_in;
enum { ARG_baudrate, ARG_polarity, ARG_phase }; enum { ARG_baudrate, ARG_polarity, ARG_phase };
static const mp_arg_t allowed_args[] = { static const mp_arg_t allowed_args[] = {
@ -150,7 +150,7 @@ STATIC void machine_hspi_init(mp_obj_base_t *self_in, size_t n_args, const mp_ob
spi_mode(HSPI, self->phase, self->polarity); spi_mode(HSPI, self->phase, self->polarity);
} }
mp_obj_t machine_hspi_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) { mp_obj_t machine_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
MP_MACHINE_SPI_CHECK_FOR_LEGACY_SOFTSPI_CONSTRUCTION(n_args, n_kw, args); MP_MACHINE_SPI_CHECK_FOR_LEGACY_SOFTSPI_CONSTRUCTION(n_args, n_kw, args);
// args[0] holds the id of the peripheral // args[0] holds the id of the peripheral
@ -159,29 +159,29 @@ mp_obj_t machine_hspi_make_new(const mp_obj_type_t *type, size_t n_args, size_t
mp_raise_ValueError(NULL); mp_raise_ValueError(NULL);
} }
machine_hspi_obj_t *self = mp_obj_malloc(machine_hspi_obj_t, &machine_hspi_type); machine_spi_obj_t *self = mp_obj_malloc(machine_spi_obj_t, &machine_spi_type);
// set defaults // set defaults
self->baudrate = 80000000L; self->baudrate = 80000000L;
self->polarity = 0; self->polarity = 0;
self->phase = 0; self->phase = 0;
mp_map_t kw_args; mp_map_t kw_args;
mp_map_init_fixed_table(&kw_args, n_kw, args + n_args); mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
machine_hspi_init((mp_obj_base_t *)self, n_args - 1, args + 1, &kw_args); machine_spi_init((mp_obj_base_t *)self, n_args - 1, args + 1, &kw_args);
return MP_OBJ_FROM_PTR(self); return MP_OBJ_FROM_PTR(self);
} }
STATIC const mp_machine_spi_p_t machine_hspi_p = { STATIC const mp_machine_spi_p_t machine_spi_p = {
.init = machine_hspi_init, .init = machine_spi_init,
.transfer = machine_hspi_transfer, .transfer = machine_spi_transfer,
}; };
MP_DEFINE_CONST_OBJ_TYPE( MP_DEFINE_CONST_OBJ_TYPE(
machine_hspi_type, machine_spi_type,
MP_QSTR_HSPI, MP_QSTR_HSPI,
MP_TYPE_FLAG_NONE, MP_TYPE_FLAG_NONE,
make_new, machine_hspi_make_new, make_new, machine_spi_make_new,
print, machine_hspi_print, print, machine_spi_print,
protocol, &machine_hspi_p, protocol, &machine_spi_p,
locals_dict, &mp_machine_spi_locals_dict locals_dict, &mp_machine_spi_locals_dict
); );

2
ports/esp8266/modmachine.c
View File

@ -432,7 +432,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
{ MP_ROM_QSTR(MP_QSTR_SoftI2C), MP_ROM_PTR(&mp_machine_soft_i2c_type) }, { MP_ROM_QSTR(MP_QSTR_SoftI2C), MP_ROM_PTR(&mp_machine_soft_i2c_type) },
#endif #endif
#if MICROPY_PY_MACHINE_SPI #if MICROPY_PY_MACHINE_SPI
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&machine_hspi_type) }, { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&machine_spi_type) },
{ MP_ROM_QSTR(MP_QSTR_SoftSPI), MP_ROM_PTR(&mp_machine_soft_spi_type) }, { MP_ROM_QSTR(MP_QSTR_SoftSPI), MP_ROM_PTR(&mp_machine_soft_spi_type) },
#endif #endif

1
ports/esp8266/modmachine.h
View File

@ -5,7 +5,6 @@
extern const mp_obj_type_t pyb_pin_type; extern const mp_obj_type_t pyb_pin_type;
extern const mp_obj_type_t pyb_rtc_type; extern const mp_obj_type_t pyb_rtc_type;
extern const mp_obj_type_t machine_hspi_type;
MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_info_obj); MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_info_obj);