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

stm32/spi: Accept machine.SPI object in spi_from_mp_obj() function.

Browse Source 
Also, change ValueError to TypeError if the argument to this function is
not of an SPI type.
This commit is contained in:
Damien George 2018-02-05 13:51:27 +11:00
parent 93d5c9e1c4
commit 20f5de9b39
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ports/stm32/spi.c
View File

@ -561,14 +561,6 @@ STATIC const pyb_spi_obj_t pyb_spi_obj[] = {
{{&pyb_spi_type}, &spi_obj[5]},
};
const spi_t *spi_from_mp_obj(mp_obj_t o) {
if (!MP_OBJ_IS_TYPE(o, &pyb_spi_type)) {
mp_raise_ValueError("expecting an SPI object");
}
pyb_spi_obj_t *self = o;
return self->spi;
}
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;
spi_print(print, self->spi, true);
@ -985,3 +977,15 @@ const mp_obj_type_t machine_hard_spi_type = {
.protocol = &machine_hard_spi_p,
.locals_dict = (mp_obj_t)&mp_machine_spi_locals_dict,
};
const spi_t *spi_from_mp_obj(mp_obj_t o) {
if (MP_OBJ_IS_TYPE(o, &pyb_spi_type)) {
pyb_spi_obj_t *self = o;
return self->spi;
} else if (MP_OBJ_IS_TYPE(o, &machine_hard_spi_type)) {
machine_hard_spi_obj_t *self = o;;
return self->spi;
} else {
mp_raise_TypeError("expecting an SPI object");
}
}