jzh/free-dap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Line endigs fix and transfer abort fix

Browse Source
This commit is contained in:
Alex Taradov 2020-02-23 14:48:05 -08:00
parent 703ef12d36
commit a8c62a932c
2 changed files with 1076 additions and 1076 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dap.c
View File

@ -37,10 +37,6 @@
#error JTAG is not supported. If you have a real need for it, please contact me. #error JTAG is not supported. If you have a real need for it, please contact me.
#endif #endif
#if DAP_CONFIG_PACKET_COUNT != 1
#error DAP_CONFIG_PACKET_COUNT must be 1 for now.
#endif
/*- Definitions -------------------------------------------------------------*/ /*- Definitions -------------------------------------------------------------*/
enum enum
{ {
@ -641,8 +637,8 @@ static void dap_info(uint8_t *req, uint8_t *resp)
else if (DAP_INFO_PACKET_SIZE == index) else if (DAP_INFO_PACKET_SIZE == index)
{ {
resp[0] = 2; resp[0] = 2;
resp[1] = DAP_CONFIG_PACKET_SIZE; resp[1] = DAP_CONFIG_PACKET_SIZE & 0xff;
resp[2] = DAP_CONFIG_PACKET_SIZE >> 8; resp[2] = (DAP_CONFIG_PACKET_SIZE >> 8) & 0xff;
} }
} }
@ -746,8 +742,8 @@ static void dap_transfer_block(uint8_t *req, uint8_t *resp)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static void dap_transfer_abort(uint8_t *req, uint8_t *resp) static void dap_transfer_abort(uint8_t *req, uint8_t *resp)
{ {
// This request is handled outside of the normal queue // This request is handled outside of the normal queue.
// TODO: verify entire transfer abort mechanism // We should never get here.
resp[0] = DAP_OK; resp[0] = DAP_OK;
(void)req; (void)req;
} }
@ -944,14 +940,17 @@ void dap_init(void)
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void dap_filter_request(uint8_t *req) bool dap_filter_request(uint8_t *req)
{ {
int cmd = req[0]; int cmd = req[0];
if (ID_DAP_TRANSFER_ABORT == cmd) if (ID_DAP_TRANSFER_ABORT == cmd)
{ {
dap_abort = true; dap_abort = true;
return false;
} }
return true;
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

3
dap.h
View File

@ -31,10 +31,11 @@
/*- Includes ----------------------------------------------------------------*/ /*- Includes ----------------------------------------------------------------*/
#include <stdint.h> #include <stdint.h>
#include <stdbool.h>
/*- Prototypes --------------------------------------------------------------*/ /*- Prototypes --------------------------------------------------------------*/
void dap_init(void); void dap_init(void);
void dap_filter_request(uint8_t *req); bool dap_filter_request(uint8_t *req);
void dap_process_request(uint8_t *req, uint8_t *resp); void dap_process_request(uint8_t *req, uint8_t *resp);
void dap_clock_test(int delay); void dap_clock_test(int delay);