setup_header -> nais_setup_header

attdona · Sep 26, 2017 · ab61240 · ab61240
1 parent ebd9a93
commit ab61240
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/burba/sys/bocia/bocia_uart.c b/burba/sys/bocia/bocia_uart.c
@@ -47,7 +47,7 @@ void protobuf_to_uart(bocia_channel_t * rd, proto_msg_t type, void* obj) {
 
     blen = protobuf_c_message_get_packed_size((const ProtobufCMessage*) obj);
     mutex_lock(&_txmutex);
-    hlen = setup_header(type, blen, _txbuff);
+    hlen = nais_setup_header(type, blen, _txbuff);
 
     protobuf_c_message_pack((const ProtobufCMessage*) obj, _txbuff + 6);
     DEBUG("sending %d bytes with len [%d]\n", hlen+blen+1, _txbuff[5]);

diff --git a/burba/sys/bocia/nais.c b/burba/sys/bocia/nais.c
@@ -28,7 +28,7 @@ void nais_free(void *obj) {
 	FREE_PROTOB(obj);
 }
 
-int8_t setup_header(proto_msg_t msg_type, int msg_len, uint8_t* buff) {
+int8_t nais_setup_header(proto_msg_t msg_type, int msg_len, uint8_t* buff) {
 	int8_t hlen = 6; // min header length
 	int8_t len_index = 5;
 	int len = msg_len;
@@ -61,7 +61,7 @@ int nais_marshall(proto_msg_t type, void* obj, unsigned char **payload) {
 
 	blen = protobuf_c_message_get_packed_size((const ProtobufCMessage*) obj);
 
-	hlen = setup_header(type, blen, protobuf);
+	hlen = nais_setup_header(type, blen, protobuf);
 
 	buffptr = protobuf + hlen;