michaelh/zephyr
1
0
Fork 0
Code Releases Activity

mgmt/osdp: Flush RX buffer before sending data

Browse source 
Partial packets in the RX buffers cause the subsequent packet to be
treated as malformed. The RX buffer can have partial data if the sender
is too slow in sending the packet of if there is an interruption in
transmission mid-way.

To avoid any issues due to such partials, flush the uart channel before
sending the command/response.

Signed-off-by: Siddharth Chandrasekaran <sidcha.dev@gmail.com>
This commit is contained in:
Siddharth Chandrasekaran 2022-05-26 14:35:58 +02:00 • committed by Carles Cufí
commit 059abd8d8b
2 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
subsys/mgmt/osdp/src/osdp_cp.c
View file

@ -519,6 +519,11 @@ static int cp_send_command(struct osdp_pd *pd)
return OSDP_CP_ERR_GENERIC;
}
/* flush rx to remove any invalid data. */
if (pd->channel.flush) {
pd->channel.flush(pd->channel.data);
}
ret = pd->channel.send(pd->channel.data, pd->rx_buf, len);
if (ret != len) {
LOG_ERR("Channel send for %d bytes failed! ret: %d", len, ret);
@ -604,14 +609,9 @@ static inline void cp_set_state(struct osdp_pd *pd, enum osdp_cp_state_e state)
CLEAR_FLAG(pd, PD_FLAG_AWAIT_RESP);
}
static void cp_reset_channel(struct osdp_pd *pd)
{
pd->rx_buf_len = 0;
if (pd->channel.flush) {
pd->channel.flush(pd->channel.data);
}
}
/**
* Note: This method must not dequeue cmd unless it reaches an invalid state.
*/
static int cp_phy_state_update(struct osdp_pd *pd)
{
int rc, ret = OSDP_CP_ERR_CAN_YIELD;
@ -629,7 +629,6 @@ static int cp_phy_state_update(struct osdp_pd *pd)
pd->cmd_id = cmd->id;
memcpy(pd->cmd_data, cmd, sizeof(struct osdp_cmd));
osdp_cmd_free(pd, cmd);
cp_reset_channel(pd);
/* fall-thru */
case OSDP_CP_PHY_STATE_SEND_CMD:
if ((cp_send_command(pd)) < 0) {
@ -672,7 +671,6 @@ static int cp_phy_state_update(struct osdp_pd *pd)
pd->phy_state = OSDP_CP_PHY_STATE_IDLE;
break;
case OSDP_CP_PHY_STATE_ERR:
cp_reset_channel(pd);
cp_flush_command_queue(pd);
pd->phy_state = OSDP_CP_PHY_STATE_ERR_WAIT;
ret = OSDP_CP_ERR_GENERIC;

5
subsys/mgmt/osdp/src/osdp_pd.c
View file

@ -630,6 +630,11 @@ static int pd_send_reply(struct osdp_pd *pd)
return OSDP_PD_ERR_GENERIC;
}
/* flush rx to remove any invalid data. */
if (pd->channel.flush) {
pd->channel.flush(pd->channel.data);
}
ret = pd->channel.send(pd->channel.data, pd->rx_buf, len);
if (ret != len) {
LOG_ERR("Channel send for %d bytes failed! ret: %d", len, ret);