From 7f1f9445d4d09946d0d24975cd11292c4ce49a39 Mon Sep 17 00:00:00 2001
From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
Date: Sat, 25 Feb 2023 17:10:01 +0100
Subject: [PATCH] cable: bus_addr, device_addr: int -> uint8_t

---
 src/cable.hpp   | 12 ++++++------
 src/ftdispi.cpp |  2 +-
 src/main.cpp    |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/cable.hpp b/src/cable.hpp
index 47bd05f..2ef49f5 100644
--- a/src/cable.hpp
+++ b/src/cable.hpp
@@ -56,23 +56,23 @@ struct cable_t {
 	communication_type type; /*! see enum communication_type */
 	int vid;                 /*! Vendor ID */
 	int pid;                 /*! Product ID */
-	int bus_addr;            /*! bus number (must be set to -1: user defined */
-	int device_addr;         /*! device number (must be set -1: user defined */
+	uint8_t bus_addr;        /*! bus number (must be set to 0: user defined */
+	uint8_t device_addr;     /*! device number (must be set 0: user defined */
 	mpsse_bit_config config; /*! FTDI specific configurations */
 };
 
 /* FTDI serial (MPSSE) configuration */
 #define FTDI_SER(_vid, _pid, _intf, _blv, _bld, _bhv, _bhd) \
-	{MODE_FTDI_SERIAL, _vid, _pid, -1, -1, {_intf, _blv, _bld, _bhv, _bhd, 0}}
+	{MODE_FTDI_SERIAL, _vid, _pid, 0, 0, {_intf, _blv, _bld, _bhv, _bhd, 0}}
 /* FTDI bitbang configuration */
 #define FTDI_BB(_vid, _pid, _intf, _blv, _bld, _bhv, _bhd) \
-	{MODE_FTDI_BITBANG, _vid, _pid, -1, -1, {_intf, _blv, _bld, _bhv, _bhd, 0}}
+	{MODE_FTDI_BITBANG, _vid, _pid, 0, 0, {_intf, _blv, _bld, _bhv, _bhd, 0}}
 /* CMSIS DAP configuration */
 #define CMSIS_CL(_vid, _pid) \
-	{MODE_CMSISDAP, _vid, _pid, -1, -1, {}}
+	{MODE_CMSISDAP, _vid, _pid, 0, 0, {}}
 /* Others cable configuration */
 #define CABLE_DEF(_type, _vid, _pid) \
-	{_type, _vid, _pid, -1, -1, {}}
+	{_type, _vid, _pid, 0, 0, {}}
 
 static std::map <std::string, cable_t> cable_list = {
 	// last 4 bytes are ADBUS7-0 value, ADBUS7-0 direction, ACBUS7-0 value, ACBUS7-0 direction
diff --git a/src/ftdispi.cpp b/src/ftdispi.cpp
index 4b086bb..4efcc33 100644
--- a/src/ftdispi.cpp
+++ b/src/ftdispi.cpp
@@ -64,7 +64,7 @@ void FtdiSpi::setMode(uint8_t mode)
 }
 
 static cable_t cable = {
-	MODE_FTDI_SERIAL, 0x403, 0x6010, -1, -1, {INTERFACE_B, 0x08, 0x0B, 0x08, 0x0B, 0}
+	MODE_FTDI_SERIAL, 0x403, 0x6010, 0, 0, {INTERFACE_B, 0x08, 0x0B, 0x08, 0x0B, 0}
 };
 
 FtdiSpi::FtdiSpi(int vid, int pid, unsigned char interface, uint32_t clkHZ,
diff --git a/src/main.cpp b/src/main.cpp
index 6ba74f0..b68b71a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -75,8 +75,8 @@ struct arguments {
 	uint16_t vid;
 	uint16_t pid;
 	int16_t cable_index;
-	int8_t bus_addr;
-	int8_t device_addr;
+	uint8_t bus_addr;
+	uint8_t device_addr;
 	string ip_adr;
 	uint32_t protect_flash;
 	bool unprotect_flash;