subtype -> flags

attdona · Sep 26, 2017 · 9acb453 · 9acb453
1 parent 058c224
commit 9acb453
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/burba/apps/hello-proto/main.c b/burba/apps/hello-proto/main.c
@@ -89,7 +89,7 @@ int8_t proto_input_handler(bocia_channel_t *rd, proto_msg_t command_id,
 
     ack.id = command_id.type;
 
-    DEBUG("executing [%d,%d] message\n", command_id.type, command_id.subtype);
+    DEBUG("executing [%d,%d] message\n", command_id.type, command_id.flags);
 
     switch (command_id.type)
     {

diff --git a/burba/sys/bocia/bocia.c b/burba/sys/bocia/bocia.c
@@ -51,7 +51,7 @@ int8_t proto_input_handler(bocia_channel_t *rd, proto_msg_t command_id,
 
     ack.id = command_id.type;
 
-    DEBUG("executing [%d,%d] message\n", command_id.type, command_id.subtype);
+    DEBUG("executing [%d,%d] message\n", command_id.type, command_id.flags);
 
     switch (command_id.type) {
         case COMMAND_TYPE: {
@@ -160,7 +160,7 @@ int8_t bocia_unmarshall(bocia_channel_t *rd, unsigned char *data,
         return INPUTHANDLER_ERR;
     }
 
-    if (ptype.subtype & (1 << DEBUG_OPTION_BIT)) {
+    if (ptype.flags & (1 << DEBUG_OPTION_BIT)) {
         rd->debug = 1;
     }
 

diff --git a/burba/sys/bocia/nais.c b/burba/sys/bocia/nais.c
@@ -37,7 +37,7 @@ int8_t setup_header(proto_msg_t msg_type, int msg_len, uint8_t* buff) {
 	buff[1] = msg_type.type;
 	buff[2] = 0;
 	buff[3] = msg_type.dline;
-	buff[4] = msg_type.subtype;
+	buff[4] = msg_type.flags;
 
 	do {
 		buff[len_index] = len % 128;
@@ -96,7 +96,7 @@ proto_msg_t nais_unmarshall(unsigned char *data, void **obj) {
 	cptr++;
 	DEBUG("[%02x] ", *cptr);
 
-	ptype.subtype = *cptr;
+	ptype.flags = *cptr;
 
 	do {
 		cptr++;

diff --git a/burba/sys/include/nais.h b/burba/sys/include/nais.h
@@ -75,7 +75,7 @@ typedef struct {
                    ///  packet that triggers a response. Set to zero if the
                    ///  packet originates from the board.
 
-    uint8_t subtype; ///< NAIS.FLAGS field
+    uint8_t flags; ///< NAIS.FLAGS field
 } proto_msg_t;
 
 

diff --git a/burba/tests/bocia/test_cases.c b/burba/tests/bocia/test_cases.c
@@ -17,7 +17,7 @@ int8_t proto_input_handler(bocia_channel_t *rd, proto_msg_t command_id,
 
     ack.id = command_id.type;
 
-    DEBUG("executing [%d,%d] message\n", command_id.type, command_id.subtype);
+    DEBUG("executing [%d,%d] message\n", command_id.type, command_id.flags);
 
     switch(command_id.type) {
         case LEDS_TYPE: {
@@ -91,7 +91,7 @@ int8_t proto_input_handler(bocia_channel_t *rd, proto_msg_t command_id,
         }
         default:
             DEBUG("recv unmanaged type [%d,%d]\n", command_id.type,
-                    command_id.subtype);
+                    command_id.flags);
 
     }
     return INPUTHANDLER_OK;

diff --git a/burba/tests/sbapp/test_cases.c b/burba/tests/sbapp/test_cases.c
@@ -17,7 +17,7 @@ int8_t proto_input_handler(bocia_channel_t *rd, proto_msg_t command_id,
 
     ack.id = command_id.type;
 
-    DEBUG("executing [%d,%d] message\n", command_id.type, command_id.subtype);
+    DEBUG("executing [%d,%d] message\n", command_id.type, command_id.flags);
 
     switch(command_id.type) {
         case LEDS_TYPE: {
@@ -96,7 +96,7 @@ int8_t proto_input_handler(bocia_channel_t *rd, proto_msg_t command_id,
         }
         default:
             DEBUG("recv unmanaged type [%d,%d]\n", command_id.type,
-                    command_id.subtype);
+                    command_id.flags);
 
     }
     return INPUTHANDLER_OK;