commit b595e7cb534d9d044b5149dfcf0ac1d4cae9a623
author Christina Quast <chrysh.ng+git@gmail.com> Sun Apr 12 13:31:01 2015 +0200
committer Christina Quast <chrysh.ng+git@gmail.com> Sun Apr 12 13:31:01 2015 +0200
tree 6a63127ada4d520a75e2964f1513bf141417228d
parent 2b8a18bf3a053496360c24e4080345f03d0498d9
parent e24b9ace89cb21ebcbadb54fce83dd2827a2480e

Merge branch 'new_iso_init' (sniffer not working)

Conflicts:
	firmware/src_simtrace/phone.c
	firmware/src_simtrace/simtrace.h

firmware/src_simtrace/host_communication.c

diff --git a/firmware/src_simtrace/host_communication.c b/firmware/src_simtrace/host_communication.c
index 87234d3..c0e0373 100644
--- a/firmware/src_simtrace/host_communication.c
+++ b/firmware/src_simtrace/host_communication.c
@@ -15,7 +15,7 @@
 {
     static uint8_t msg[RING_BUFLEN];
     int ret = 0;
-    int i;
+    unsigned int i;
 
     for(i = 0; !rbuf_is_empty(&sim_rcv_buf) && i < sizeof(msg); i++) {
         msg[i] = rbuf_read(&sim_rcv_buf);