diff options
author | Fred Sundvik <fsundvik@gmail.com> | 2016-02-21 23:17:59 +0200 |
---|---|---|
committer | Fred Sundvik <fsundvik@gmail.com> | 2016-02-21 23:17:59 +0200 |
commit | 6873b17117a41715c9a8ca63060974b64b4cdcf4 (patch) | |
tree | 74ed87abb4b19ec1922e98798ab35dc32b61110a /serial_link/protocol/transport.c | |
parent | 8cbfe79dd9ce2e8113a0f99e15d6ae4d3176b545 (diff) |
Support for Chibios compilation
Remove some warnings, change the include paths.
Diffstat (limited to 'serial_link/protocol/transport.c')
-rw-r--r-- | serial_link/protocol/transport.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/serial_link/protocol/transport.c b/serial_link/protocol/transport.c index 03f83a8068..4542a7a050 100644 --- a/serial_link/protocol/transport.c +++ b/serial_link/protocol/transport.c @@ -22,9 +22,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "protocol/transport.h" -#include "protocol/frame_router.h" -#include "protocol/triple_buffered_object.h" +#include "serial_link/protocol/transport.h" +#include "serial_link/protocol/frame_router.h" +#include "serial_link/protocol/triple_buffered_object.h" +#include <string.h> static remote_object_t** remote_objects; static uint32_t num_remote_objects; @@ -32,7 +33,7 @@ static uint32_t num_remote_objects; void init_transport(remote_object_t** _remote_objects, uint32_t _num_remote_objects) { remote_objects = _remote_objects; num_remote_objects = _num_remote_objects; - int i; + unsigned int i; for(i=0;i<num_remote_objects;i++) { remote_object_t* obj = remote_objects[i]; if (obj->object_type == MASTER_TO_ALL_SLAVES) { @@ -44,7 +45,7 @@ void init_transport(remote_object_t** _remote_objects, uint32_t _num_remote_obje } else if(obj->object_type == MASTER_TO_SINGLE_SLAVE) { uint8_t* start = obj->buffer; - int j; + unsigned int j; for (j=0;j<NUM_SLAVES;j++) { triple_buffer_object_t* tb = (triple_buffer_object_t*)start; triple_buffer_init(tb); @@ -58,7 +59,7 @@ void init_transport(remote_object_t** _remote_objects, uint32_t _num_remote_obje triple_buffer_object_t* tb = (triple_buffer_object_t*)start; triple_buffer_init(tb); start += LOCAL_OBJECT_SIZE(obj->object_size); - int j; + unsigned int j; for (j=0;j<NUM_SLAVES;j++) { tb = (triple_buffer_object_t*)start; triple_buffer_init(tb); @@ -88,11 +89,8 @@ void transport_recv_frame(uint8_t from, uint8_t* data, uint16_t size) { triple_buffer_end_write_internal(tb); } -uint32_t transport_send_frame(uint8_t to, uint8_t* data, uint16_t size) { -} - void update_transport(void) { - int i; + unsigned int i; for(i=0;i<num_remote_objects;i++) { remote_object_t* obj = remote_objects[i]; if (obj->object_type == MASTER_TO_ALL_SLAVES || obj->object_type == SLAVE_TO_MASTER) { @@ -106,7 +104,7 @@ void update_transport(void) { } else { uint8_t* start = obj->buffer; - int j; + unsigned int j; for (j=0;j<NUM_SLAVES;j++) { triple_buffer_object_t* tb = (triple_buffer_object_t*)start; uint8_t* ptr = (uint8_t*)triple_buffer_read_internal(obj->object_size + LOCAL_OBJECT_EXTRA, tb); |