Skip to content
Snippets Groups Projects
Commit 5d93df09 authored by deuce's avatar deuce
Browse files

Move wait for response into zmodem_recv_crc() where it belongs.

parent ec74f9bf
No related branches found
No related tags found
No related merge requests found
...@@ -1344,10 +1344,6 @@ BOOL zmodem_request_crc(zmodem_t* zm, int32_t length) ...@@ -1344,10 +1344,6 @@ BOOL zmodem_request_crc(zmodem_t* zm, int32_t length)
{ {
zmodem_recv_purge(zm); zmodem_recv_purge(zm);
zmodem_send_pos_header(zm,ZCRC,length,TRUE); zmodem_send_pos_header(zm,ZCRC,length,TRUE);
if(!zmodem_data_waiting(zm,zm->crc_timeout)) {
lprintf(zm,LOG_ERR,"Timeout waiting for response (%u seconds)", zm->crc_timeout);
return(FALSE);
}
return TRUE; return TRUE;
} }
...@@ -1355,6 +1351,10 @@ BOOL zmodem_recv_crc(zmodem_t* zm, uint32_t* crc) ...@@ -1355,6 +1351,10 @@ BOOL zmodem_recv_crc(zmodem_t* zm, uint32_t* crc)
{ {
int type; int type;
if(!zmodem_data_waiting(zm,zm->crc_timeout)) {
lprintf(zm,LOG_ERR,"Timeout waiting for response (%u seconds)", zm->crc_timeout);
return(FALSE);
}
if((type=zmodem_recv_header(zm))!=ZCRC) { if((type=zmodem_recv_header(zm))!=ZCRC) {
lprintf(zm,LOG_ERR,"Received %s instead of ZCRC", frame_desc(type)); lprintf(zm,LOG_ERR,"Received %s instead of ZCRC", frame_desc(type));
return(FALSE); return(FALSE);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment