Rename SubNode -> Node

diff --git a/vw-bap-sniffer.c b/vw-bap-sniffer.c
index 3639a07b4590bce7ec557654df0e83441a1aa28e..5a14320f799546f4840b79f4f7dfd77bb97671af 100644 (file)
--- a/vw-bap-sniffer.c
+++ b/vw-bap-sniffer.c
@@ -72,15 +72,15 @@ int main(int argc, char **argv)
        int s;
        unsigned can_id;
        struct BAP_RXer *bap;
-       unsigned sub_node_id;
+       unsigned node_id;
 
        if (argc < 4) {
-               printf("syntax: %s IFNAME CAN_ID SubNode \n", argv[0]);
+               printf("syntax: %s IFNAME CAN_ID bap_node \n", argv[0]);
                return 1;
        }
 
        can_id = strtoul(argv[2], NULL, 0);
-       sub_node_id = strtoul(argv[3], NULL, 0);
+       node_id = strtoul(argv[3], NULL, 0);
 
        bap = vw_bap_alloc();
        if (!bap) {
@@ -88,7 +88,7 @@ int main(int argc, char **argv)
                return 1;
        }
 
-       printf("Listening for CAN ID: %x and SubNode %d\n", can_id, sub_node_id);
+       printf("Listening for CAN ID: %x and Node %d\n", can_id, node_id);
 
 
 
@@ -127,12 +127,12 @@ int main(int argc, char **argv)
                                unsigned i;
 
                                bap_frame = vw_bap_handle_can_frame(bap, &frame);
-                               if (bap_frame && bap_frame->subnode == sub_node_id) {
+                               if (bap_frame && bap_frame->node == node_id) {
                                        mvprintw(bap_frame->function, 0, "");
 
                                        printw("%u. %2i/%-2i .%02i --",
                                                bap_frame->opcode,
-                                               bap_frame->subnode,
+                                               bap_frame->node,
                                                bap_frame->function,
                                                bap_frame->len);
 

diff --git a/vw-bap.c b/vw-bap.c
index 2d7daec1ff78b3d733f9be867670ff150948b2b7..51941473624a6209dd113866be933831a05bc3cd 100644 (file)
--- a/vw-bap.c
+++ b/vw-bap.c
@@ -14,7 +14,7 @@ void vw_bap_frame_dump(struct BAP_Frame *bap_frame)
 
        printf("%u. %2i/%-2i .%02i --",
                bap_frame->opcode,
-               bap_frame->subnode,
+               bap_frame->node,
                bap_frame->function,
                bap_frame->len);
 
@@ -85,7 +85,7 @@ struct BAP_Frame* vw_bap_handle_can_frame(struct BAP_RXer *bap, struct can_frame
 
                        header = (frame->data[2] << 8) | frame->data[3];
                        bap_frame->opcode = (header >> 12) & 0x7;
-                       bap_frame->subnode = (header >> 6) & 0x3F;
+                       bap_frame->node = (header >> 6) & 0x3F;
                        bap_frame->function = (header >> 0) & 0x3F;
 
                        bap_frame->len = ((frame->data[0] & 0xF) << 8) | frame->data[1];
@@ -161,7 +161,7 @@ struct BAP_Frame* vw_bap_handle_can_frame(struct BAP_RXer *bap, struct can_frame
 
                header = (frame->data[0] << 8) | frame->data[1];
                bap_frame->opcode = (header >> 12) & 0x7;
-               bap_frame->subnode = (header >> 6) & 0x3F;
+               bap_frame->node = (header >> 6) & 0x3F;
                bap_frame->function = (header >> 0) & 0x3F;
 
                this_len = frame->can_dlc - 2;

diff --git a/vw-bap.h b/vw-bap.h
index 5485138c0bbebeaab02a331ad246f09d28313c7e..61e5da5a9d6de342aeec01bdd2d9bf91717ffdaf 100644 (file)
--- a/vw-bap.h
+++ b/vw-bap.h
@@ -5,8 +5,8 @@
 
 
 typedef unsigned char BAP_OpCode;
-typedef unsigned char BAP_SubNode;
-typedef unsigned char BAP_SubFunction;
+typedef unsigned char BAP_Node;
+typedef unsigned char BAP_Function;
 typedef unsigned short BAP_FrameLen;
 
 
@@ -15,8 +15,8 @@ struct BAP_Frame {
        int is_multiframe;
 
        BAP_OpCode opcode;
-       BAP_SubNode subnode;
-       BAP_SubFunction function;
+       BAP_Node node;
+       BAP_Function function;
        BAP_FrameLen len;
 
        char data[4096];