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

stmhal: Fix ptr arith in CC3000 code; enable network build in travis.

Browse Source
This commit is contained in:
Damien George 2014-10-30 15:28:15 +00:00
parent 8bb71f0b06
commit 11aa91615e
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -17,6 +17,7 @@ script:
- make -C bare-arm - make -C bare-arm
- make -C qemu-arm - make -C qemu-arm
- make -C stmhal - make -C stmhal
- make -C stmhal -B MICROPY_PY_WIZNET5K=1 MICROPY_PY_CC3K=1
- make -C stmhal BOARD=STM32F4DISC - make -C stmhal BOARD=STM32F4DISC
- make -C teensy - make -C teensy
- make -C windows CROSS_COMPILE=i586-mingw32msvc- - make -C windows CROSS_COMPILE=i586-mingw32msvc-

2
stmhal/modcc3k.c
View File

@ -381,7 +381,7 @@ STATIC mp_obj_t cc3k_socket_send(mp_obj_t self_in, mp_obj_t buf_in) {
mp_int_t bytes = 0; mp_int_t bytes = 0;
while (bytes < bufinfo.len) { while (bytes < bufinfo.len) {
int n = MIN((bufinfo.len - bytes), MAX_TX_PACKET); int n = MIN((bufinfo.len - bytes), MAX_TX_PACKET);
n = CC3000_EXPORT(send)(self->fd, bufinfo.buf + bytes, n, 0); n = CC3000_EXPORT(send)(self->fd, (uint8_t*)bufinfo.buf + bytes, n, 0);
if (n <= 0) { if (n <= 0) {
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(CC3000_EXPORT(errno)))); nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(CC3000_EXPORT(errno))));
} }