diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/chibios/serial_usart.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/chibios/serial_usart.c b/drivers/chibios/serial_usart.c index a3e21f90b..7c81b1646 100644 --- a/drivers/chibios/serial_usart.c +++ b/drivers/chibios/serial_usart.c | |||
| @@ -58,7 +58,10 @@ | |||
| 58 | # error invalid SELECT_SOFT_SERIAL_SPEED value | 58 | # error invalid SELECT_SOFT_SERIAL_SPEED value |
| 59 | #endif | 59 | #endif |
| 60 | 60 | ||
| 61 | #define TIMEOUT 100 | 61 | #ifndef SERIAL_USART_TIMEOUT |
| 62 | # define SERIAL_USART_TIMEOUT 100 | ||
| 63 | #endif | ||
| 64 | |||
| 62 | #define HANDSHAKE_MAGIC 7 | 65 | #define HANDSHAKE_MAGIC 7 |
| 63 | 66 | ||
| 64 | static inline msg_t sdWriteHalfDuplex(SerialDriver* driver, uint8_t* data, uint8_t size) { | 67 | static inline msg_t sdWriteHalfDuplex(SerialDriver* driver, uint8_t* data, uint8_t size) { |
| @@ -201,21 +204,21 @@ int soft_serial_transaction(int index) { | |||
| 201 | sdClear(&SERIAL_USART_DRIVER); | 204 | sdClear(&SERIAL_USART_DRIVER); |
| 202 | 205 | ||
| 203 | // First chunk is always transaction id | 206 | // First chunk is always transaction id |
| 204 | sdWriteTimeout(&SERIAL_USART_DRIVER, &sstd_index, sizeof(sstd_index), TIME_MS2I(TIMEOUT)); | 207 | sdWriteTimeout(&SERIAL_USART_DRIVER, &sstd_index, sizeof(sstd_index), TIME_MS2I(SERIAL_USART_TIMEOUT)); |
| 205 | 208 | ||
| 206 | uint8_t sstd_index_shake = 0xFF; | 209 | uint8_t sstd_index_shake = 0xFF; |
| 207 | 210 | ||
| 208 | // Which we always read back first so that we can error out correctly | 211 | // Which we always read back first so that we can error out correctly |
| 209 | // - due to the half duplex limitations on return codes, we always have to read *something* | 212 | // - due to the half duplex limitations on return codes, we always have to read *something* |
| 210 | // - without the read, write only transactions *always* succeed, even during the boot process where the slave is not ready | 213 | // - without the read, write only transactions *always* succeed, even during the boot process where the slave is not ready |
| 211 | res = sdReadTimeout(&SERIAL_USART_DRIVER, &sstd_index_shake, sizeof(sstd_index_shake), TIME_MS2I(TIMEOUT)); | 214 | res = sdReadTimeout(&SERIAL_USART_DRIVER, &sstd_index_shake, sizeof(sstd_index_shake), TIME_MS2I(SERIAL_USART_TIMEOUT)); |
| 212 | if (res < 0 || (sstd_index_shake != (sstd_index ^ HANDSHAKE_MAGIC))) { | 215 | if (res < 0 || (sstd_index_shake != (sstd_index ^ HANDSHAKE_MAGIC))) { |
| 213 | dprintf("serial::usart_shake NO_RESPONSE\n"); | 216 | dprintf("serial::usart_shake NO_RESPONSE\n"); |
| 214 | return TRANSACTION_NO_RESPONSE; | 217 | return TRANSACTION_NO_RESPONSE; |
| 215 | } | 218 | } |
| 216 | 219 | ||
| 217 | if (trans->initiator2target_buffer_size) { | 220 | if (trans->initiator2target_buffer_size) { |
| 218 | res = sdWriteTimeout(&SERIAL_USART_DRIVER, trans->initiator2target_buffer, trans->initiator2target_buffer_size, TIME_MS2I(TIMEOUT)); | 221 | res = sdWriteTimeout(&SERIAL_USART_DRIVER, trans->initiator2target_buffer, trans->initiator2target_buffer_size, TIME_MS2I(SERIAL_USART_TIMEOUT)); |
| 219 | if (res < 0) { | 222 | if (res < 0) { |
| 220 | dprintf("serial::usart_transmit NO_RESPONSE\n"); | 223 | dprintf("serial::usart_transmit NO_RESPONSE\n"); |
| 221 | return TRANSACTION_NO_RESPONSE; | 224 | return TRANSACTION_NO_RESPONSE; |
| @@ -223,7 +226,7 @@ int soft_serial_transaction(int index) { | |||
| 223 | } | 226 | } |
| 224 | 227 | ||
| 225 | if (trans->target2initiator_buffer_size) { | 228 | if (trans->target2initiator_buffer_size) { |
| 226 | res = sdReadTimeout(&SERIAL_USART_DRIVER, trans->target2initiator_buffer, trans->target2initiator_buffer_size, TIME_MS2I(TIMEOUT)); | 229 | res = sdReadTimeout(&SERIAL_USART_DRIVER, trans->target2initiator_buffer, trans->target2initiator_buffer_size, TIME_MS2I(SERIAL_USART_TIMEOUT)); |
| 227 | if (res < 0) { | 230 | if (res < 0) { |
| 228 | dprintf("serial::usart_receive NO_RESPONSE\n"); | 231 | dprintf("serial::usart_receive NO_RESPONSE\n"); |
| 229 | return TRANSACTION_NO_RESPONSE; | 232 | return TRANSACTION_NO_RESPONSE; |
