summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornorly <ny-git@enpas.org>2019-01-23 16:19:18 +0100
committernorly <ny-git@enpas.org>2019-01-23 16:19:18 +0100
commit93b5d3d7b9687d3bae6dca2d2e0464ad3a68c8ae (patch)
treec0a7d151d0fd8bc5f9f5338275610aa13b558241
parent54b669c7ee4b74b3625acb4e9d8d0cd3d4e10d5a (diff)
Replace '>' with constant ELM327_READY_CHAR
-rw-r--r--module/elmcan.c7
-rw-r--r--readme.rst2
2 files changed, 4 insertions, 5 deletions
diff --git a/module/elmcan.c b/module/elmcan.c
index 494dceb..e455202 100644
--- a/module/elmcan.c
+++ b/module/elmcan.c
@@ -57,6 +57,7 @@ MODULE_AUTHOR("Max Staudt <max-linux@enpas.org>");
#define ELM327_MAGIC_CHAR 'y'
#define ELM327_MAGIC_STRING "y"
+#define ELM327_READY_CHAR '>'
/* Bits in elm->cmds_todo */
@@ -623,7 +624,7 @@ static void elm327_parse_rxbuf(struct elmcan *elm)
elm->state = ELM_GETPROMPT;
i++;
break;
- } else if (elm->rxbuf[i] == '>') {
+ } else if (elm->rxbuf[i] == ELM327_READY_CHAR) {
elm327_send(elm, ELM327_MAGIC_STRING, 1);
i++;
break;
@@ -637,7 +638,7 @@ static void elm327_parse_rxbuf(struct elmcan *elm)
case ELM_GETPROMPT:
/* Wait for '>' */
- if (elm->rxbuf[elm->rxfill - 1] == '>') {
+ if (elm->rxbuf[elm->rxfill - 1] == ELM327_READY_CHAR) {
elm327_handle_prompt(elm);
}
@@ -660,7 +661,7 @@ static void elm327_parse_rxbuf(struct elmcan *elm)
elm327_panic(elm);
} else if (len == elm->rxfill) {
if (elm->state == ELM_RECEIVING
- && elm->rxbuf[elm->rxfill - 1] == '>') {
+ && elm->rxbuf[elm->rxfill - 1] == ELM327_READY_CHAR) {
/* The ELM327's AT ST response timeout ran out,
* so we got a prompt.
* Clear RX buffer and restart listening.
diff --git a/readme.rst b/readme.rst
index 2ff9fe4..45c5c6c 100644
--- a/readme.rst
+++ b/readme.rst
@@ -270,6 +270,4 @@ To Do list for future development
- DMA capable rx/tx buffers
-- fixup constants, constant for '``>``'
-
- flushing of ``tx_work`` is too late in ``ldisc_close()``