projects
/
revag-nm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3b89821
)
Change timeout name
author
norly
<ny-git@enpas.org>
Sat, 18 Mar 2017 22:00:53 +0000
(23:00 +0100)
committer
norly
<ny-git@enpas.org>
Sat, 18 Mar 2017 22:00:53 +0000
(23:00 +0100)
vw-nm.c
patch
|
blob
|
history
vw-nm.h
patch
|
blob
|
history
diff --git
a/vw-nm.c
b/vw-nm.c
index 5e88227d9dd66a12bff95e9e3c0f00830130d511..9ca640044b493c0f010be7c412b4a4d7e483763d 100644
(file)
--- a/
vw-nm.c
+++ b/
vw-nm.c
@@
-144,7
+144,7
@@
static void nm_handle_can_frame(struct NM_Main *nm, struct can_frame *frame)
* can send its login frame to correct us.
*/
nm->tv.tv_sec = 0;
- nm->tv.tv_usec = NM_USECS_
MY
_TURN;
+ nm->tv.tv_usec = NM_USECS_
NORMAL
_TURN;
} else {
/* We just got some random ON message.
* Reset the timer looking out for broken
diff --git
a/vw-nm.h
b/vw-nm.h
index 01f3c44a819ac6a2e9fd683deef9163a1b584365..4a85f2a26067355006b19b63d98ecc80c2dd3646 100644
(file)
--- a/
vw-nm.h
+++ b/
vw-nm.h
@@
-49,7
+49,7
@@
struct NM_Main {
*
* We may reduce it since we're not on a real-time OS.
*/
-#define NM_USECS_
MY
_TURN 45000
+#define NM_USECS_
NORMAL
_TURN 45000
/* This timeout is 140 ms in: