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

Added new info strings and version information

Browse Source
This commit is contained in:
Alex Taradov 2022-03-02 16:04:07 -08:00
parent 1d5c72ba44
commit 0644042b94
7 changed files with 94 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
bin/free_dap_rp2040.uf2
View File

Binary file not shown.

113
dap.c
View File

@ -34,6 +34,8 @@
#include "dap.h"
/*- Definitions -------------------------------------------------------------*/
#define ARRAY_SIZE(x) ((int)(sizeof(x) / sizeof(0[x])))
enum
{
ID_DAP_INFO = 0x00,
@ -83,17 +85,33 @@ enum
DAP_INFO_VENDOR = 0x01,
DAP_INFO_PRODUCT = 0x02,
DAP_INFO_SER_NUM = 0x03,
DAP_INFO_FW_VER = 0x04, // DAP_INFO_CMSIS_DAP_VER
DAP_INFO_CMSIS_DAP_VER = 0x04,
DAP_INFO_DEVICE_VENDOR = 0x05,
DAP_INFO_DEVICE_NAME = 0x06,
DAP_INFO_PRODUCT_FW_VER = 0x07,
DAP_INFO_BOARD_VENDOR = 0x07,
DAP_INFO_BOARD_NAME = 0x08,
DAP_INFO_FW_VER = 0x09,
DAP_INFO_CAPABILITIES = 0xf0,
DAP_INFO_TIMESTAMP_CLOCK = 0xf1,
DAP_INFO_SWO_BUFFER_SIZE = 0xfd,
DAP_INFO_TDT = 0xf1,
DAP_INFO_UART_RX_SIZE = 0xfb,
DAP_INFO_UART_TX_SIZE = 0xfc,
DAP_INFO_SWO_BUF_SIZE = 0xfd,
DAP_INFO_PACKET_COUNT = 0xfe,
DAP_INFO_PACKET_SIZE = 0xff,
};
enum
{
DAP_CAP_SWD = (1 << 0),
DAP_CAP_JTAG = (1 << 1),
DAP_CAP_SWO_UART = (1 << 2),
DAP_CAP_SWO_MANCHESTER = (1 << 3),
DAP_CAP_ATOMIC_CMD = (1 << 4),
DAP_CAP_TDT = (1 << 5),
DAP_CAP_SWO_STREAMING = (1 << 6),
DAP_CAP_UART_COM_PORT = (1 << 7),
};
enum
{
DAP_TRANSFER_APnDP = 1 << 0,
@ -172,14 +190,39 @@ enum
#define ARM_JTAG_IR_LENGTH 4
/*- Constants ---------------------------------------------------------------*/
static const char * const dap_info_strings[] =
static const struct
{
[DAP_INFO_VENDOR] = DAP_CONFIG_VENDOR_STR,
[DAP_INFO_PRODUCT] = DAP_CONFIG_PRODUCT_STR,
[DAP_INFO_SER_NUM] = DAP_CONFIG_SER_NUM_STR,
[DAP_INFO_FW_VER] = DAP_CONFIG_FW_VER_STR,
[DAP_INFO_DEVICE_VENDOR] = DAP_CONFIG_DEVICE_VENDOR_STR,
[DAP_INFO_DEVICE_NAME] = DAP_CONFIG_DEVICE_NAME_STR,
int id;
char * const str;
} dap_info_strings[] =
{
#ifdef DAP_CONFIG_VENDOR_STR
{ DAP_INFO_VENDOR, DAP_CONFIG_VENDOR_STR },
#endif
#ifdef DAP_CONFIG_PRODUCT_STR
{ DAP_INFO_PRODUCT, DAP_CONFIG_PRODUCT_STR },
#endif
#ifdef DAP_CONFIG_SER_NUM_STR
{ DAP_INFO_SER_NUM, DAP_CONFIG_SER_NUM_STR },
#endif
#ifdef DAP_CONFIG_CMSIS_DAP_VER_STR
{ DAP_INFO_CMSIS_DAP_VER, DAP_CONFIG_CMSIS_DAP_VER_STR },
#endif
#ifdef DAP_CONFIG_DEVICE_VENDOR_STR
{ DAP_INFO_DEVICE_VENDOR, DAP_CONFIG_DEVICE_VENDOR_STR },
#endif
#ifdef DAP_CONFIG_DEVICE_NAME_STR
{ DAP_INFO_DEVICE_NAME, DAP_CONFIG_DEVICE_NAME_STR },
#endif
#ifdef DAP_CONFIG_BOARD_VENDOR_STR
{ DAP_INFO_BOARD_VENDOR, DAP_CONFIG_BOARD_VENDOR_STR },
#endif
#ifdef DAP_CONFIG_BOARD_NAME_STR
{ DAP_INFO_BOARD_NAME, DAP_CONFIG_BOARD_NAME_STR },
#endif
#ifdef DAP_CONFIG_FW_VER_STR
{ DAP_INFO_FW_VER, DAP_CONFIG_FW_VER_STR },
#endif
};
/*- Variables ---------------------------------------------------------------*/
@ -753,30 +796,11 @@ static void dap_info(void)
{
int index = dap_req_get_byte();
if (DAP_INFO_VENDOR <= index && index <= DAP_INFO_DEVICE_NAME)
if (DAP_INFO_CAPABILITIES == index)
{
if (dap_info_strings[index])
{
const char *str = dap_info_strings[index];
dap_resp_add_byte(0); // Size placeholder
while (*str)
dap_resp_add_byte(*str++);
dap_resp_add_byte(0);
dap_resp_set_byte(1, dap_resp_ptr-1);
}
else
{
dap_resp_add_byte(0);
}
}
else if (DAP_INFO_CAPABILITIES == index)
{
int cap = DAP_PORT_SWD;
int cap = DAP_CAP_SWD;
#ifdef DAP_CONFIG_ENABLE_JTAG
cap |= DAP_PORT_JTAG;
cap |= DAP_CAP_JTAG;
#endif
dap_resp_add_byte(1);
dap_resp_add_byte(cap);
@ -794,7 +818,23 @@ static void dap_info(void)
}
else
{
dap_resp_add_byte(0);
dap_resp_add_byte(0); // Size placeholder
for (int i = 0; i < ARRAY_SIZE(dap_info_strings); i++)
{
if (dap_info_strings[i].id == index)
{
const char *str = dap_info_strings[i].str;
while (*str)
dap_resp_add_byte(*str++);
dap_resp_add_byte(0);
dap_resp_set_byte(1, dap_resp_ptr-1);
break;
}
}
}
}
@ -1411,7 +1451,6 @@ int dap_process_request(uint8_t *req, int req_size, uint8_t *resp, int resp_size
{ ID_DAP_JTAG_SEQUENCE, dap_jtag_sequence },
{ ID_DAP_JTAG_CONFIGURE, dap_jtag_configure },
{ ID_DAP_JTAG_IDCODE, dap_jtag_idcode },
{ -1, NULL },
};
int cmd;
@ -1426,7 +1465,7 @@ int dap_process_request(uint8_t *req, int req_size, uint8_t *resp, int resp_size
cmd = dap_req_get_byte();
dap_resp_add_byte(cmd);
for (int i = 0; -1 != handlers[i].cmd; i++)
for (int i = 0; i < ARRAY_SIZE(handlers); i++)
{
if (cmd == handlers[i].cmd)
{
@ -1468,5 +1507,3 @@ void dap_clock_test(int delay)
dap_swj_run_fast(1<<30);
}
}

5
platform/rp2040/dap_config.h
View File

@ -19,14 +19,11 @@
#define DAP_CONFIG_JTAG_DEV_COUNT 8
// Set the value to NULL if you want to disable a string
// DAP_CONFIG_PRODUCT_STR must contain "CMSIS-DAP" to be compatible with the standard
#define DAP_CONFIG_VENDOR_STR "Alex Taradov"
#define DAP_CONFIG_PRODUCT_STR "Generic CMSIS-DAP Adapter"
#define DAP_CONFIG_SER_NUM_STR usb_serial_number
#define DAP_CONFIG_FW_VER_STR "v1.0"
#define DAP_CONFIG_DEVICE_VENDOR_STR NULL
#define DAP_CONFIG_DEVICE_NAME_STR NULL
#define DAP_CONFIG_CMSIS_DAP_VER_STR "1.3.0"
//#define DAP_CONFIG_RESET_TARGET_FN target_specific_reset_function
//#define DAP_CONFIG_VENDOR_FN vendor_command_handler_function

34
platform/samd11/dap_config.h
View File

@ -1,30 +1,5 @@
/*
* Copyright (c) 2017-2021, Alex Taradov <alex@taradov.com>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
// SPDX-License-Identifier: BSD-3-Clause
// Copyright (c) 2017-2022, Alex Taradov <alex@taradov.com>. All rights reserved.
#ifndef _DAP_CONFIG_H_
#define _DAP_CONFIG_H_
@ -50,14 +25,11 @@ HAL_GPIO_PIN(nRESET, A, 5)
#define DAP_CONFIG_JTAG_DEV_COUNT 8
// Set the value to NULL if you want to disable a string
// DAP_CONFIG_PRODUCT_STR must contain "CMSIS-DAP" to be compatible with the standard
#define DAP_CONFIG_VENDOR_STR "Alex Taradov"
#define DAP_CONFIG_PRODUCT_STR "Generic CMSIS-DAP Adapter"
#define DAP_CONFIG_SER_NUM_STR usb_serial_number
#define DAP_CONFIG_FW_VER_STR "v1.0"
#define DAP_CONFIG_DEVICE_VENDOR_STR NULL
#define DAP_CONFIG_DEVICE_NAME_STR NULL
#define DAP_CONFIG_CMSIS_DAP_VER_STR "1.3.0"
//#define DAP_CONFIG_RESET_TARGET_FN target_specific_reset_function
//#define DAP_CONFIG_VENDOR_FN vendor_command_handler_function

34
platform/samd11_vcp/dap_config.h
View File

@ -1,30 +1,5 @@
/*
* Copyright (c) 2017, Alex Taradov <alex@taradov.com>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
// SPDX-License-Identifier: BSD-3-Clause
// Copyright (c) 2017-2022, Alex Taradov <alex@taradov.com>. All rights reserved.
#ifndef _DAP_CONFIG_H_
#define _DAP_CONFIG_H_
@ -42,14 +17,11 @@
#define DAP_CONFIG_JTAG_DEV_COUNT 8
// Set the value to NULL if you want to disable a string
// DAP_CONFIG_PRODUCT_STR must contain "CMSIS-DAP" to be compatible with the standard
#define DAP_CONFIG_VENDOR_STR "Alex Taradov"
#define DAP_CONFIG_PRODUCT_STR "Generic CMSIS-DAP Adapter"
#define DAP_CONFIG_SER_NUM_STR usb_serial_number
#define DAP_CONFIG_FW_VER_STR "v1.0"
#define DAP_CONFIG_DEVICE_VENDOR_STR NULL
#define DAP_CONFIG_DEVICE_NAME_STR NULL
#define DAP_CONFIG_CMSIS_DAP_VER_STR "1.3.0"
//#define DAP_CONFIG_RESET_TARGET_FN target_specific_reset_function
//#define DAP_CONFIG_VENDOR_FN vendor_command_handler_function

34
platform/samd21/dap_config.h
View File

@ -1,30 +1,5 @@
/*
* Copyright (c) 2016, Alex Taradov <alex@taradov.com>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
// SPDX-License-Identifier: BSD-3-Clause
// Copyright (c) 2016-2022, Alex Taradov <alex@taradov.com>. All rights reserved.
#ifndef _DAP_CONFIG_H_
#define _DAP_CONFIG_H_
@ -53,14 +28,11 @@ HAL_GPIO_PIN(LED, B, 30)
#define DAP_CONFIG_JTAG_DEV_COUNT 8
// Set the value to NULL if you want to disable a string
// DAP_CONFIG_PRODUCT_STR must contain "CMSIS-DAP" to be compatible with the standard
#define DAP_CONFIG_VENDOR_STR "Alex Taradov"
#define DAP_CONFIG_PRODUCT_STR "Generic CMSIS-DAP Adapter"
#define DAP_CONFIG_SER_NUM_STR "123456"
#define DAP_CONFIG_FW_VER_STR "v0.1"
#define DAP_CONFIG_DEVICE_VENDOR_STR NULL
#define DAP_CONFIG_DEVICE_NAME_STR NULL
#define DAP_CONFIG_CMSIS_DAP_VER_STR "1.3.0"
//#define DAP_CONFIG_RESET_TARGET_FN target_specific_reset_function
//#define DAP_CONFIG_VENDOR_FN vendor_command_handler_function

40
platform/same70/dap_config.h
View File

@ -1,30 +1,5 @@
/*
* Copyright (c) 2020, Alex Taradov <alex@taradov.com>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
// SPDX-License-Identifier: BSD-3-Clause
// Copyright (c) 2020-2022, Alex Taradov <alex@taradov.com>. All rights reserved.
#ifndef _DAP_CONFIG_H_
#define _DAP_CONFIG_H_
@ -48,14 +23,11 @@ HAL_GPIO_PIN(nRESET, D, 22)
#define DAP_CONFIG_JTAG_DEV_COUNT 8
// Set the value to NULL if you want to disable a string
// DAP_CONFIG_PRODUCT_STR must contain "CMSIS-DAP" to be compatible with the standard
#define DAP_CONFIG_VENDOR_STR "Alex Taradov"
#define DAP_CONFIG_PRODUCT_STR "Generic CMSIS-DAP Adapter"
#define DAP_CONFIG_SER_NUM_STR usb_serial_number
#define DAP_CONFIG_FW_VER_STR "v1.0"
#define DAP_CONFIG_DEVICE_VENDOR_STR NULL
#define DAP_CONFIG_DEVICE_NAME_STR NULL
#define DAP_CONFIG_CMSIS_DAP_VER_STR "1.3.0"
//#define DAP_CONFIG_RESET_TARGET_FN target_specific_reset_function
//#define DAP_CONFIG_VENDOR_FN vendor_command_handler_function
@ -87,6 +59,12 @@ static inline void DAP_CONFIG_SWDIO_TMS_write(int value)
HAL_GPIO_SWDIO_TMS_write(value);
}
//-----------------------------------------------------------------------------
static inline void DAP_CONFIG_TDI_write(int value)
{
(void)value;
}
//-----------------------------------------------------------------------------
static inline void DAP_CONFIG_TDO_write(int value)
{