From 68e519e4afc53f86efd3aa9cc6c731cf56d31645 Mon Sep 17 00:00:00 2001
From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
Date: Sat, 15 Oct 2022 17:12:45 +0200
Subject: [PATCH] src/ftdipp_mpsse: _bus/_addr: change type to uint8_t, default
 value to 0 and use cable_t bus_addr/device_addr$

---
 src/ftdipp_mpsse.cpp | 13 +++++++------
 src/ftdipp_mpsse.hpp |  4 ++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/ftdipp_mpsse.cpp b/src/ftdipp_mpsse.cpp
index 94d53c7..cef14c7 100644
--- a/src/ftdipp_mpsse.cpp
+++ b/src/ftdipp_mpsse.cpp
@@ -29,7 +29,8 @@ using namespace std;
 FTDIpp_MPSSE::FTDIpp_MPSSE(const cable_t &cable, const string &dev,
 				const std::string &serial, uint32_t clkHZ, int8_t verbose):
 				_verbose(verbose > 2), _cable(cable.config), _vid(0),
-				_pid(0), _index(0), _bus(-1), _addr(-1),
+				_pid(0), _index(0),
+				_bus(cable.bus_addr), _addr(cable.device_addr),
 				_interface(cable.config.interface),
 				_clkHZ(clkHZ), _buffer_size(2*32768), _num(0)
 {
@@ -138,7 +139,7 @@ void FTDIpp_MPSSE::open_device(const std::string &serial, unsigned int baudrate)
 		throw std::runtime_error(err);
 	}
 
-	if (_bus == -1 || _addr == -1)
+	if (_bus == 0 || _addr == 0)
 		ret = ftdi_usb_open_desc_index(_ftdi, _vid, _pid, NULL, serial.empty() ? NULL : serial.c_str(), _index);
 	else
 #if (FTDI_VERSION < 104)
@@ -839,10 +840,10 @@ bool FTDIpp_MPSSE::search_with_dev(const string &device)
 		return false;
 	}
 
-	_bus = udevstufftoint(udev_device_get_sysattr_value(
-				usbdeviceparent, "busnum"), 10);
-	_addr = udevstufftoint(udev_device_get_sysattr_value(
-				usbdeviceparent, "devnum"), 10);
+	_bus = static_cast<uint8_t>(udevstufftoint(udev_device_get_sysattr_value(
+				usbdeviceparent, "busnum"), 10));
+	_addr = static_cast<uint8_t>(udevstufftoint(udev_device_get_sysattr_value(
+				usbdeviceparent, "devnum"), 10));
 	sprintf(_product, "%s", udev_device_get_sysattr_value(usbdeviceparent, "product"));
 	_vid = udevstufftoint(
 		udev_device_get_sysattr_value(usbdeviceparent, "idVendor"), 16);
diff --git a/src/ftdipp_mpsse.hpp b/src/ftdipp_mpsse.hpp
index 847cea6..23528d3 100644
--- a/src/ftdipp_mpsse.hpp
+++ b/src/ftdipp_mpsse.hpp
@@ -65,8 +65,8 @@ class FTDIpp_MPSSE {
 		int _pid;
 		int _index;
 	private:
-		int _bus;
-		int _addr;
+		uint8_t _bus;
+		uint8_t _addr;
 		char _product[64];
 		unsigned char _interface;
 		/* gpio */