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

dpgeorge · dpgeorge · commit 11aa91615ec2 · 2014-10-30T15:28:15.000Z
diff --git a/.travis.yml b/.travis.yml
@@ -17,6 +17,7 @@ script:
   - make -C bare-arm
   - make -C qemu-arm
   - make -C stmhal
+  - make -C stmhal -B MICROPY_PY_WIZNET5K=1 MICROPY_PY_CC3K=1
   - make -C stmhal BOARD=STM32F4DISC
   - make -C teensy
   - make -C windows CROSS_COMPILE=i586-mingw32msvc-
diff --git a/stmhal/modcc3k.c b/stmhal/modcc3k.c
@@ -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;
     while (bytes < bufinfo.len) {
         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) {
             nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(CC3000_EXPORT(errno))));
         }

Original file line number	Diff line number	Diff line change
`@@ -381,7 +381,7 @@ STATIC mp_obj_t cc3k_socket_send(mp_obj_t self_in, mp_obj_t buf_in) {`
`381`	`381`	`mp_int_t bytes = 0;`
`382`	`382`	`while (bytes < bufinfo.len) {`
`383`	`383`	`int n = MIN((bufinfo.len - bytes), MAX_TX_PACKET);`
`384`		`- n = CC3000_EXPORT(send)(self->fd, bufinfo.buf + bytes, n, 0);`
	`384`	`+ n = CC3000_EXPORT(send)(self->fd, (uint8_t*)bufinfo.buf + bytes, n, 0);`
`385`	`385`	`if (n <= 0) {`
`386`	`386`	`nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(CC3000_EXPORT(errno))));`
`387`	`387`	`}`