Rename cl_utils.* to cli.*, and fix references

File "serial_unix.c" edited but Linux build not done (Windows only dev environment)

src/platforms/hosted/Makefile.inc

@@ -72,7 +72,7 @@ ifneq ($(HOSTED_BMP_ONLY), 1)
  endif
 endif
 
-SRC += timing.c cl_utils.c utils.c
+SRC += timing.c cli.c utils.c
 SRC += bmp_remote.c remote_swdptap.c remote_jtagtap.c
 ifneq ($(HOSTED_BMP_ONLY), 1)
 SRC += bmp_libusb.c stlinkv2.c

src/platforms/hosted/bmp_hosted.h

@@ -1,7 +1,7 @@
 #if !defined(__BMP_LIBUSB_H)
 #define      __BMP_LIBUSB_H
 
-#include "cl_utils.h"
+#include "cli.h"
 
 #if HOSTED_BMP_ONLY != 1
 # include <libusb-1.0/libusb.h>

src/platforms/hosted/bmp_remote.c

@@ -25,7 +25,7 @@
 #include "remote.h"
 #include "target.h"
 #include "bmp_remote.h"
-#include "cl_utils.h"
+#include "cli.h"
 #include "hex_utils.h"
 
 #include <assert.h>

src/platforms/hosted/cli.c

@@ -33,7 +33,7 @@
 #include "cortexm.h"
 #include "command.h"
 
-#include "cl_utils.h"
+#include "cli.h"
 #include "bmp_hosted.h"
 
 #ifndef O_BINARY

src/platforms/hosted/cli.h

@@ -21,8 +21,8 @@
 /* This file implements the interface to command line command for PC-Hosted
  * platforms.
  */
-#if !defined(__CL_UTILS_H)
+#if !defined(__CLI_H)
-#define __CL_UTILS_H
+#define __CLI_H
 
 #include "cortexm.h"
 

src/platforms/hosted/cmsis_dap.h

@@ -20,7 +20,7 @@
 #define __CMSIS_DAP_H_
 
 #include "adiv5.h"
-#include "cl_utils.h"
+#include "cli.h"
 
 #if defined(CMSIS_DAP)
 int dap_init(bmp_info_t *info);

src/platforms/hosted/ftdi_bmp.h

@@ -22,7 +22,7 @@
 #ifndef __FTDI_BMP_H
 #define __FTDI_BMP_H
 
-#include "cl_utils.h"
+#include "cli.h"
 #include "jtagtap.h"
 
 #include "bmp_hosted.h"

src/platforms/hosted/platform.c

@@ -26,7 +26,7 @@
 #include "target_internal.h"
 #include "adiv5.h"
 #include "timing.h"
-#include "cl_utils.h"
+#include "cli.h"
 #include "gdb_if.h"
 #include <signal.h>
 
@@ -40,7 +40,6 @@
 #include "ftdi_bmp.h"
 #include "jlink.h"
 #include "cmsis_dap.h"
-#include "cl_utils.h"
 
 bmp_info_t info;
 

src/platforms/hosted/serial_unix.c

@@ -27,7 +27,7 @@
 #include <unistd.h>
 
 #include "remote.h"
-#include "cl_utils.h"
+#include "cli.h"
 #include "cortexm.h"
 
 static int fd;  /* File descriptor for connection to GDB remote */

src/platforms/hosted/serial_win.c

@@ -20,7 +20,7 @@
 #include "general.h"
 #include <windows.h>
 #include "remote.h"
-#include "cl_utils.h"
+#include "cli.h"
 
 static HANDLE hComm;