From 51dd4ce6bbc3c6f200001640f2cb1638b5185cb7 Mon Sep 17 00:00:00 2001 From: Marc Schink Date: Wed, 5 Feb 2020 16:07:48 +0100 Subject: [PATCH] drivers: Rename 'libusb1_common' to 'libusb_helper' The name 'common' does not make sense anymore. While at it, remove some unnecessary #includes. Change-Id: If9798a5cce179438d89428a598d8ca05c8e5f20c Signed-off-by: Marc Schink Reviewed-on: http://openocd.zylin.com/5434 Tested-by: jenkins Reviewed-by: Oleksij Rempel --- src/jtag/aice/aice_interface.c | 1 - src/jtag/aice/aice_usb.c | 2 +- src/jtag/drivers/Makefile.am | 5 ++-- src/jtag/drivers/ft232r.c | 2 +- src/jtag/drivers/kitprog.c | 2 +- src/jtag/drivers/libusb_common.h | 25 ------------------- .../{libusb1_common.c => libusb_helper.c} | 2 +- .../{libusb1_common.h => libusb_helper.h} | 6 ++--- src/jtag/drivers/opendous.c | 2 +- src/jtag/drivers/openjtag.c | 2 +- src/jtag/drivers/osbdm.c | 2 +- src/jtag/drivers/stlink_usb.c | 2 +- .../usb_blaster/ublast2_access_libusb.c | 2 +- src/jtag/drivers/usb_blaster/ublast_access.h | 2 -- 14 files changed, 14 insertions(+), 43 deletions(-) delete mode 100644 src/jtag/drivers/libusb_common.h rename src/jtag/drivers/{libusb1_common.c => libusb_helper.c} (99%) rename src/jtag/drivers/{libusb1_common.h => libusb_helper.h} (95%) diff --git a/src/jtag/aice/aice_interface.c b/src/jtag/aice/aice_interface.c index f9bd87eeb3..90871a1386 100644 --- a/src/jtag/aice/aice_interface.c +++ b/src/jtag/aice/aice_interface.c @@ -25,7 +25,6 @@ #include #include #include -#include #include "aice_usb.h" #define AICE_KHZ_TO_SPEED_MAP_SIZE 16 diff --git a/src/jtag/aice/aice_usb.c b/src/jtag/aice/aice_usb.c index 8c3a629a03..5fefdd0b4e 100644 --- a/src/jtag/aice/aice_usb.c +++ b/src/jtag/aice/aice_usb.c @@ -19,7 +19,7 @@ #include "config.h" #endif -#include +#include #include #include #include diff --git a/src/jtag/drivers/Makefile.am b/src/jtag/drivers/Makefile.am index 47b19470ee..aea09b38ce 100644 --- a/src/jtag/drivers/Makefile.am +++ b/src/jtag/drivers/Makefile.am @@ -22,7 +22,7 @@ DRIVERFILES += %D%/driver.c DRIVERFILES += %D%/jtag_usb_common.c if USE_LIBUSB1 -DRIVERFILES += %D%/libusb1_common.c +DRIVERFILES += %D%/libusb_helper.c %C%_libocdjtagdrivers_la_CPPFLAGS += $(LIBUSB1_CFLAGS) %C%_libocdjtagdrivers_la_LIBADD += $(LIBUSB1_LIBS) endif @@ -168,8 +168,7 @@ DRIVERHEADERS = \ %D%/bitbang.h \ %D%/bitq.h \ %D%/jtag_usb_common.h \ - %D%/libusb1_common.h \ - %D%/libusb_common.h \ + %D%/libusb_helper.h \ %D%/minidriver_imp.h \ %D%/mpsse.h \ %D%/rlink.h \ diff --git a/src/jtag/drivers/ft232r.c b/src/jtag/drivers/ft232r.c index 8fe63bb35c..4812362a37 100644 --- a/src/jtag/drivers/ft232r.c +++ b/src/jtag/drivers/ft232r.c @@ -29,7 +29,7 @@ #include #include #include -#include "libusb1_common.h" +#include "libusb_helper.h" /* system includes */ #include diff --git a/src/jtag/drivers/kitprog.c b/src/jtag/drivers/kitprog.c index e26f5aa924..0c1e74c42c 100644 --- a/src/jtag/drivers/kitprog.c +++ b/src/jtag/drivers/kitprog.c @@ -43,7 +43,7 @@ #include #include -#include "libusb_common.h" +#include "libusb_helper.h" #define VID 0x04b4 #define PID 0xf139 diff --git a/src/jtag/drivers/libusb_common.h b/src/jtag/drivers/libusb_common.h deleted file mode 100644 index 47aca5d91e..0000000000 --- a/src/jtag/drivers/libusb_common.h +++ /dev/null @@ -1,25 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2011 by Mauro Gamba * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#ifndef OPENOCD_JTAG_DRIVERS_LIBUSB_COMMON_H -#define OPENOCD_JTAG_DRIVERS_LIBUSB_COMMON_H - -#ifdef HAVE_LIBUSB1 -#include "libusb1_common.h" -#endif - -#endif /* OPENOCD_JTAG_DRIVERS_LIBUSB_COMMON_H */ diff --git a/src/jtag/drivers/libusb1_common.c b/src/jtag/drivers/libusb_helper.c similarity index 99% rename from src/jtag/drivers/libusb1_common.c rename to src/jtag/drivers/libusb_helper.c index 607b6d4aa9..5a8129cb93 100644 --- a/src/jtag/drivers/libusb1_common.c +++ b/src/jtag/drivers/libusb_helper.c @@ -21,7 +21,7 @@ #include "config.h" #endif #include -#include "libusb1_common.h" +#include "libusb_helper.h" #include "log.h" /* diff --git a/src/jtag/drivers/libusb1_common.h b/src/jtag/drivers/libusb_helper.h similarity index 95% rename from src/jtag/drivers/libusb1_common.h rename to src/jtag/drivers/libusb_helper.h index b132e26ae6..46e4954e78 100644 --- a/src/jtag/drivers/libusb1_common.h +++ b/src/jtag/drivers/libusb_helper.h @@ -17,8 +17,8 @@ * along with this program. If not, see . * ***************************************************************************/ -#ifndef OPENOCD_JTAG_DRIVERS_LIBUSB1_COMMON_H -#define OPENOCD_JTAG_DRIVERS_LIBUSB1_COMMON_H +#ifndef OPENOCD_JTAG_DRIVERS_LIBUSB_HELPER_H +#define OPENOCD_JTAG_DRIVERS_LIBUSB_HELPER_H #include @@ -55,4 +55,4 @@ int jtag_libusb_choose_interface(struct libusb_device_handle *devh, int bclass, int subclass, int protocol, int trans_type); int jtag_libusb_get_pid(struct libusb_device *dev, uint16_t *pid); -#endif /* OPENOCD_JTAG_DRIVERS_LIBUSB1_COMMON_H */ +#endif /* OPENOCD_JTAG_DRIVERS_LIBUSB_HELPER_H */ diff --git a/src/jtag/drivers/opendous.c b/src/jtag/drivers/opendous.c index 18d9543083..7298a2a109 100644 --- a/src/jtag/drivers/opendous.c +++ b/src/jtag/drivers/opendous.c @@ -32,7 +32,7 @@ #include #include -#include "libusb_common.h" +#include "libusb_helper.h" #include #include diff --git a/src/jtag/drivers/openjtag.c b/src/jtag/drivers/openjtag.c index 3bfcccf6eb..7b07813d89 100644 --- a/src/jtag/drivers/openjtag.c +++ b/src/jtag/drivers/openjtag.c @@ -45,7 +45,7 @@ #include #include -#include "libusb_common.h" +#include "libusb_helper.h" static enum { OPENJTAG_VARIANT_STANDARD, diff --git a/src/jtag/drivers/osbdm.c b/src/jtag/drivers/osbdm.c index 30c46234e7..aea126d0d3 100644 --- a/src/jtag/drivers/osbdm.c +++ b/src/jtag/drivers/osbdm.c @@ -23,7 +23,7 @@ #include #include #include -#include "libusb_common.h" +#include "libusb_helper.h" struct sequence { int len; diff --git a/src/jtag/drivers/stlink_usb.c b/src/jtag/drivers/stlink_usb.c index a186dfdef4..ca7a4df4e8 100644 --- a/src/jtag/drivers/stlink_usb.c +++ b/src/jtag/drivers/stlink_usb.c @@ -41,7 +41,7 @@ #include -#include "libusb_common.h" +#include "libusb_helper.h" #ifdef HAVE_LIBUSB1 #define USE_LIBUSB_ASYNCIO diff --git a/src/jtag/drivers/usb_blaster/ublast2_access_libusb.c b/src/jtag/drivers/usb_blaster/ublast2_access_libusb.c index 34fbb89525..4f7ee63007 100644 --- a/src/jtag/drivers/usb_blaster/ublast2_access_libusb.c +++ b/src/jtag/drivers/usb_blaster/ublast2_access_libusb.c @@ -23,7 +23,7 @@ #endif #include #include -#include +#include #include #include "ublast_access.h" diff --git a/src/jtag/drivers/usb_blaster/ublast_access.h b/src/jtag/drivers/usb_blaster/ublast_access.h index 5178ae10ba..ad20d65d4f 100644 --- a/src/jtag/drivers/usb_blaster/ublast_access.h +++ b/src/jtag/drivers/usb_blaster/ublast_access.h @@ -28,8 +28,6 @@ #ifndef OPENOCD_JTAG_DRIVERS_USB_BLASTER_UBLAST_ACCESS_H #define OPENOCD_JTAG_DRIVERS_USB_BLASTER_UBLAST_ACCESS_H -#include - /* Low level flags */ #define COPY_TDO_BUFFER (1 << 0) -- 2.30.2