Add general support for CH347 based interfaces and configurations for EasyDevKits interfaces (OCD-839)

cmake/BuildOptions.cmake

@@ -39,6 +39,7 @@ option(BUILD_SANITIZERS "Build support with the sanitizer flags" OFF)
 
 # USB1 Adapters #TODO check default values
 option(BUILD_FTDI "MPSSE mode of FTDI based devices" ON)
+option(BUILD_CH347 "Mode 3 of the CH347 devices" ON)
 option(BUILD_HLADAPTER_STLINK "ST-Link Programmer" ON)
 option(BUILD_HLADAPTER_ICDI "TI ICDI JTAG Programmer" ON)
 option(BUILD_ULINK "Keil ULINK JTAG Programmer" ON)

configure.ac

@@ -116,6 +116,7 @@ m4_define([ADAPTER_OPT], [m4_translit(ADAPTER_ARG($1), [_], [-])])
 
 m4_define([USB1_ADAPTERS],
 	[[[ftdi], [MPSSE mode of FTDI based devices], [FTDI]],
+  [[ch347], [Mode 3 of the CH347 devices], [CH347]],
 	[[stlink], [ST-Link Programmer], [HLADAPTER_STLINK]],
 	[[ti_icdi], [TI ICDI JTAG Programmer], [HLADAPTER_ICDI]],
 	[[ulink], [Keil ULINK JTAG Programmer], [ULINK]],
@@ -393,6 +394,10 @@ AC_ARG_ENABLE([remote-bitbang],
   AS_HELP_STRING([--enable-remote-bitbang], [Enable building support for the Remote Bitbang jtag driver]),
   [build_remote_bitbang=$enableval], [build_remote_bitbang=no])
 
+AC_ARG_ENABLE([ch347],
+  AS_HELP_STRING([--enable-ch347], [Enable building support for CH347]),
+  [build_ch347=$enableval], [build_ch347=no])
+
 AS_CASE(["${host_cpu}"],
   [i?86|x86*], [],
   [
@@ -643,6 +648,12 @@ AS_IF([test "x$build_gcov" = "xyes"], [
   AC_DEFINE([BUILD_GCOV], [0], [0 if you don't want OpenOCD source code coverage support.])
 ])
 
+AS_IF([test "x$build_ch347" = "xyes"], [
+  AC_DEFINE([BUILD_CH347], [1], [1 if you want CH347.])
+], [
+  AC_DEFINE([BUILD_CH347], [0], [0 if you don't want CH347.])
+])
+
 PKG_CHECK_MODULES([LIBUSB1], [libusb-1.0], [
 	use_libusb1=yes
 	AC_DEFINE([HAVE_LIBUSB1], [1], [Define if you have libusb-1.x])
@@ -804,6 +815,8 @@ AM_CONDITIONAL([BUILD_ESP_COMPRESSION], [test "x$build_esp_compression" = "xyes"
 
 AM_CONDITIONAL([BUILD_GCOV], [test "x$build_gcov" = "xyes"])
 
+AM_CONDITIONAL([BUILD_CH347], [test "x$build_ch347" = "xyes"])
+
 # Look for environ alternatives.  Possibility #1: is environ in unistd.h or stdlib.h?
 AC_MSG_CHECKING([for environ in unistd.h and stdlib.h])
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[

src/jtag/drivers/CMakeLists.txt

@@ -232,6 +232,10 @@ if(IS_ESPIDF)
     target_link_libraries(ocdjtagdrivers PRIVATE idf::driver)
 endif()
 
+if(BUILD_CH347)
+    target_sources(ocdjtagdrivers PRIVATE ch347.c)
+endif()
+
 target_sources(ocdjtagdrivers PRIVATE
     bitbang.h
     bitq.h

src/jtag/drivers/Makefile.am

@@ -204,6 +204,9 @@ endif
 if BUILD_ESP_REMOTE
 DRIVERFILES += %D%/jtag_esp_remote.c
 endif
+if CH347
+DRIVERFILES += %D%/ch347.c
+endif
 
 DRIVERHEADERS = \
 	%D%/bitbang.h \

src/jtag/drivers/angie.c

@@ -255,7 +255,7 @@ static int angie_usb_open(struct angie *device)
 	const uint16_t vids[] = {ANGIE_VID, ANGIE_VID, 0};
 	const uint16_t pids[] = {ANGIE_PID, ANGIE_PID_2, 0};
 
-	int ret = jtag_libusb_open(vids, pids, &usb_device_handle, NULL);
+	int ret = jtag_libusb_open(vids, pids, NULL, &usb_device_handle, NULL);
 
 	if (ret != ERROR_OK)
 		return ret;

src/jtag/drivers/arm-jtag-ew.c

@@ -677,7 +677,7 @@ static struct armjtagew *armjtagew_usb_open(void)
 	const uint16_t pids[] = { USB_PID, 0 };
 	struct libusb_device_handle *dev;
 
-	if (jtag_libusb_open(vids, pids, &dev, NULL) != ERROR_OK)
+	if (jtag_libusb_open(vids, pids, NULL, &dev, NULL) != ERROR_OK)
 		return NULL;
 
 	struct armjtagew *result = malloc(sizeof(struct armjtagew));