projects
/
elmcan.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6cce55d
)
Minor cleanups
author
norly
<ny-git@enpas.org>
Thu, 17 Mar 2022 00:32:39 +0000
(
01:32
+0100)
committer
norly
<ny-git@enpas.org>
Thu, 17 Mar 2022 00:32:39 +0000
(
01:32
+0100)
module/elmcan.c
patch
|
blob
|
history
diff --git
a/module/elmcan.c
b/module/elmcan.c
index fd38475b0306b3538b8a14cbbb696b6127efa4a6..a75ddf1c3b4288d773333bf7f9828168f067bf1c 100644
(file)
--- a/
module/elmcan.c
+++ b/
module/elmcan.c
@@
-209,8
+209,8
@@
static void elm327_send_frame(struct elmcan *elm, struct can_frame *frame)
/* Schedule any necessary changes in ELM327's CAN configuration */
if (elm->can_frame_to_send.can_id != frame->can_id) {
/* Set the new CAN ID for transmission. */
/* Schedule any necessary changes in ELM327's CAN configuration */
if (elm->can_frame_to_send.can_id != frame->can_id) {
/* Set the new CAN ID for transmission. */
- if ((frame->can_id & CAN_EFF_FLAG)
-
^
(elm->can_frame_to_send.can_id & CAN_EFF_FLAG)) {
+ if ((frame->can_id & CAN_EFF_FLAG)
^
+ (elm->can_frame_to_send.can_id & CAN_EFF_FLAG)) {
elm->can_config = (frame->can_id & CAN_EFF_FLAG
? 0
: ELM327_CAN_CONFIG_SEND_SFF)
elm->can_config = (frame->can_id & CAN_EFF_FLAG
? 0
: ELM327_CAN_CONFIG_SEND_SFF)
@@
-469,7
+469,6
@@
static int elm327_parse_frame(struct elmcan *elm, size_t len)
frame->can_id = CAN_EFF_FLAG;
datastart = 14;
} else if (elm->rxbuf[3] == ' ' && elm->rxbuf[5] == ' ') {
frame->can_id = CAN_EFF_FLAG;
datastart = 14;
} else if (elm->rxbuf[3] == ' ' && elm->rxbuf[5] == ' ') {
- frame->can_id = 0;
datastart = 6;
} else {
/* This is not a well-formatted data line.
datastart = 6;
} else {
/* This is not a well-formatted data line.