diff options
| -rw-r--r-- | vw-bap-frame.c | 4 | ||||
| -rw-r--r-- | vw-bap-rx.c | 4 | ||||
| -rw-r--r-- | vw-bap-send.c | 8 | ||||
| -rw-r--r-- | vw-bap-sniffer.c | 6 | ||||
| -rw-r--r-- | vw-bap-tx.c | 4 | ||||
| -rw-r--r-- | vw-bap.h | 8 |
6 files changed, 17 insertions, 17 deletions
diff --git a/vw-bap-frame.c b/vw-bap-frame.c index 41d9e90..1fa353f 100644 --- a/vw-bap-frame.c +++ b/vw-bap-frame.c @@ -28,7 +28,7 @@ int vw_bap_frame_is_valid(struct BAP_Frame *bap_frame) if ( 0 || (bap_frame->opcode > 7) || (bap_frame->node > 63) - || (bap_frame->function > 63) + || (bap_frame->port > 63) || (bap_frame->len > 4095) || (!bap_frame->is_multiframe && bap_frame->len > 6) ) { @@ -66,7 +66,7 @@ void vw_bap_frame_dump(struct BAP_Frame *bap_frame) printf("%u. %2i/%-2i .%02i --", bap_frame->opcode, bap_frame->node, - bap_frame->function, + bap_frame->port, bap_frame->len); for (i = 0; i < bap_frame->len; i++) { diff --git a/vw-bap-rx.c b/vw-bap-rx.c index 229a55d..e17dee3 100644 --- a/vw-bap-rx.c +++ b/vw-bap-rx.c @@ -50,7 +50,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->node = (header >> 6) & 0x3F; - bap_frame->function = (header >> 0) & 0x3F; + bap_frame->port = (header >> 0) & 0x3F; bap_frame->len = ((frame->data[0] & 0xF) << 8) | frame->data[1]; @@ -126,7 +126,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->node = (header >> 6) & 0x3F; - bap_frame->function = (header >> 0) & 0x3F; + bap_frame->port = (header >> 0) & 0x3F; this_len = frame->can_dlc - 2; diff --git a/vw-bap-send.c b/vw-bap-send.c index 04f9118..55cd222 100644 --- a/vw-bap-send.c +++ b/vw-bap-send.c @@ -99,10 +99,10 @@ int main(int argc, char **argv) unsigned bap_multiframe; unsigned bap_opcode; unsigned bap_node; - unsigned bap_function; + unsigned bap_port; if (argc < 8) { - printf("syntax: %s IFNAME CAN_ID multiframe bap_opcode bap_node bap_function bap_data\n", argv[0]); + printf("syntax: %s IFNAME CAN_ID multiframe bap_opcode bap_node bap_port bap_data\n", argv[0]); return 1; } @@ -111,7 +111,7 @@ int main(int argc, char **argv) bap_multiframe = strtoul(argv[3], NULL, 0); bap_opcode = strtoul(argv[4], NULL, 0); bap_node = strtoul(argv[5], NULL, 0); - bap_function = strtoul(argv[6], NULL, 0); + bap_port = strtoul(argv[6], NULL, 0); /* bap_data */ @@ -133,7 +133,7 @@ int main(int argc, char **argv) bap_frame->is_multiframe = !(!bap_multiframe); bap_frame->opcode = bap_opcode & 0x7; bap_frame->node = bap_node & 0x3f; - bap_frame->function = bap_function & 0x3f; + bap_frame->port = bap_port & 0x3f; bap_frame->len = 0; /* Fill payload */ diff --git a/vw-bap-sniffer.c b/vw-bap-sniffer.c index ac1ef79..f7f493c 100644 --- a/vw-bap-sniffer.c +++ b/vw-bap-sniffer.c @@ -128,12 +128,12 @@ int main(int argc, char **argv) bap_frame = vw_bap_handle_can_frame(bap, &frame); if (bap_frame && bap_frame->node == node_id) { - mvprintw(bap_frame->function, 0, ""); + mvprintw(bap_frame->port, 0, ""); printw("%u. %2i/%-2i .%c%02i --", bap_frame->opcode, bap_frame->node, - bap_frame->function, + bap_frame->port, bap_frame->is_multiframe ? 'm' : 's', bap_frame->len); @@ -153,7 +153,7 @@ int main(int argc, char **argv) printw("\n"); /* ASCII dump */ - mvprintw(bap_frame->function, 64, ""); + mvprintw(bap_frame->port, 64, ""); for (i = 0; i < bap_frame->len; i++) { unsigned char c = bap_frame->data[i]; if (!isprint(c) || c == '\n' || c == '\r') { diff --git a/vw-bap-tx.c b/vw-bap-tx.c index f8a88b7..a2f5f02 100644 --- a/vw-bap-tx.c +++ b/vw-bap-tx.c @@ -18,7 +18,7 @@ static void vw_bap_txer_build_only_can_frame(struct BAP_Frame *bap_frame, struct frame->data[0] = (bap_frame->opcode & 0x7) << 4; frame->data[0] |= (bap_frame->node & 0x3f) >> 2; frame->data[1] = (bap_frame->node & 0x3) << 6; - frame->data[1] |= bap_frame->function & 0x3f; + frame->data[1] |= bap_frame->port & 0x3f; frame->can_dlc = 2 + bap_frame->len; memcpy(&frame->data[2], bap_frame->data, bap_frame->len); @@ -40,7 +40,7 @@ static void vw_bap_txer_build_first_can_frame(struct BAP_TXer* bap, unsigned slo frame->data[2] = (bap_frame->opcode & 0x7) << 4; frame->data[2] |= (bap_frame->node & 0x3f) >> 2; frame->data[3] = (bap_frame->node & 0x3) << 6; - frame->data[3] |= bap_frame->function & 0x3f; + frame->data[3] |= bap_frame->port & 0x3f; if (bap_frame->len <= 4) { frame->can_dlc = 4 + bap_frame->len; @@ -6,7 +6,7 @@ typedef unsigned char BAP_OpCode; typedef unsigned char BAP_Node; -typedef unsigned char BAP_Function; +typedef unsigned char BAP_Port; typedef unsigned short BAP_FrameLen; @@ -32,11 +32,11 @@ struct BAP_Frame { */ BAP_Node node; - /* The "RPC" function, or "status register" ID. + /* The "RPC" port, or "status register" ID. * - * BAP's equivalent of a "TCP port". + * BAP's equivalent of a "UDP port". */ - BAP_Function function; + BAP_Port port; /* Payload length, up to 2^12-1 = 4095 bytes. */ BAP_FrameLen len; |