diff options
| author | Paul Sokolovsky | 2016-10-26 01:11:14 +0300 |
|---|---|---|
| committer | Damien George | 2016-11-15 16:31:57 +1100 |
| commit | 7602dc5f327215d5d4b7f58852e53f3084d9ac15 (patch) | |
| tree | e9f667f6f5ecc16f372f5295b82800fa0047ae51 /cc3200/mods/pybspi.c | |
| parent | 659b06b2501dd15d7efe7758befe30ce960f390d (diff) | |
cc3200/pybspi: Remove static mode=SPI.MASTER parameter for latest HW API.
Per the latest HW API, "SPI" class implements only master side of the
protocol, so mode=SPI.MASTER (which was static for WiPy anyway) is not
required (or allowed). This change is required to correspond to updated
documentation of machine.SPI class which no longer lists "mode".
Diffstat (limited to 'cc3200/mods/pybspi.c')
| -rw-r--r-- | cc3200/mods/pybspi.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/cc3200/mods/pybspi.c b/cc3200/mods/pybspi.c index 5a040e3f5..dd52e81b9 100644 --- a/cc3200/mods/pybspi.c +++ b/cc3200/mods/pybspi.c @@ -148,7 +148,7 @@ STATIC void pybspi_transfer (pyb_spi_obj_t *self, const char *txdata, char *rxda STATIC void pyb_spi_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) { pyb_spi_obj_t *self = self_in; if (self->baudrate > 0) { - mp_printf(print, "SPI(0, SPI.MASTER, baudrate=%u, bits=%u, polarity=%u, phase=%u, firstbit=SPI.MSB)", + mp_printf(print, "SPI(0, baudrate=%u, bits=%u, polarity=%u, phase=%u, firstbit=SPI.MSB)", self->baudrate, (self->wlen * 8), self->polarity, self->phase); } else { mp_print_str(print, "SPI(0)"); @@ -156,13 +156,8 @@ STATIC void pyb_spi_print(const mp_print_t *print, mp_obj_t self_in, mp_print_ki } STATIC mp_obj_t pyb_spi_init_helper(pyb_spi_obj_t *self, const mp_arg_val_t *args) { - // verify that mode is master - if (args[0].u_int != SPI_MODE_MASTER) { - goto invalid_args; - } - uint bits; - switch (args[2].u_int) { + switch (args[1].u_int) { case 8: bits = SPI_WL_8; break; @@ -177,27 +172,27 @@ STATIC mp_obj_t pyb_spi_init_helper(pyb_spi_obj_t *self, const mp_arg_val_t *arg break; } - uint polarity = args[3].u_int; - uint phase = args[4].u_int; + uint polarity = args[2].u_int; + uint phase = args[3].u_int; if (polarity > 1 || phase > 1) { goto invalid_args; } - uint firstbit = args[5].u_int; + uint firstbit = args[4].u_int; if (firstbit != PYBSPI_FIRST_BIT_MSB) { goto invalid_args; } // build the configuration - self->baudrate = args[1].u_int; - self->wlen = args[2].u_int >> 3; + self->baudrate = args[0].u_int; + self->wlen = args[1].u_int >> 3; self->config = bits | SPI_CS_ACTIVELOW | SPI_SW_CTRL_CS | SPI_4PIN_MODE | SPI_TURBO_OFF; self->polarity = polarity; self->phase = phase; self->submode = (polarity << 1) | phase; // assign the pins - mp_obj_t pins_o = args[6].u_obj; + mp_obj_t pins_o = args[5].u_obj; if (pins_o != mp_const_none) { mp_obj_t *pins; if (pins_o == MP_OBJ_NULL) { @@ -223,7 +218,6 @@ invalid_args: static const mp_arg_t pyb_spi_init_args[] = { { MP_QSTR_id, MP_ARG_INT, {.u_int = 0} }, - { MP_QSTR_mode, MP_ARG_INT, {.u_int = SPI_MODE_MASTER} }, { MP_QSTR_baudrate, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 1000000} }, // 1MHz { MP_QSTR_bits, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 8} }, { MP_QSTR_polarity, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} }, |