From edab781d4415cfe7174108616aa2a3dcc10c3f84 Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Fri, 2 Aug 2024 11:43:15 -0500 Subject: [PATCH] Fix signedness issue in LogitechG815Controller.cpp --- .../LogitechG815Controller.cpp | 43 +++++++++---------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/Controllers/LogitechController/LogitechG815Controller/LogitechG815Controller.cpp b/Controllers/LogitechController/LogitechG815Controller/LogitechG815Controller.cpp index 8c872bed..aa9cad80 100644 --- a/Controllers/LogitechController/LogitechG815Controller/LogitechG815Controller.cpp +++ b/Controllers/LogitechController/LogitechG815Controller/LogitechG815Controller.cpp @@ -71,7 +71,7 @@ void LogitechG815Controller::SetMode void LogitechG815Controller::SendCommit() { - char usb_buf[20]; + unsigned char usb_buf[20]; /*-----------------------------------------------------*\ | Zero out buffer | @@ -89,13 +89,13 @@ void LogitechG815Controller::SendCommit() /*-----------------------------------------------------*\ | Send packet | \*-----------------------------------------------------*/ - hid_write(dev_pkt_0x11, (unsigned char *)usb_buf, 20); - hid_read_timeout(dev_pkt_0x11, (unsigned char *)usb_buf, 20, LOGITECH_READ_TIMEOUT); + hid_write(dev_pkt_0x11, usb_buf, 20); + hid_read_timeout(dev_pkt_0x11, usb_buf, 20, LOGITECH_READ_TIMEOUT); } void LogitechG815Controller::InitializeDirect() { - char usb_buf[20]; + unsigned char usb_buf[20]; /*-----------------------------------------------------*\ | Zero out buffer | @@ -113,8 +113,8 @@ void LogitechG815Controller::InitializeDirect() /*-----------------------------------------------------*\ | Send packet | \*-----------------------------------------------------*/ - hid_write(dev_pkt_0x11, (unsigned char *)usb_buf, 20); - hid_read(dev_pkt_0x11, (unsigned char *)usb_buf, 20); + hid_write(dev_pkt_0x11, usb_buf, 20); + hid_read(dev_pkt_0x11, usb_buf, 20); /*-----------------------------------------------------*\ | Zero out buffer | @@ -132,8 +132,8 @@ void LogitechG815Controller::InitializeDirect() /*-----------------------------------------------------*\ | Send packet | \*-----------------------------------------------------*/ - hid_write(dev_pkt_0x11, (unsigned char *)usb_buf, 20); - hid_read(dev_pkt_0x11, (unsigned char *)usb_buf, 20); + hid_write(dev_pkt_0x11, usb_buf, 20); + hid_read(dev_pkt_0x11, usb_buf, 20); /*-----------------------------------------------------*\ | Zero out buffer | @@ -152,8 +152,8 @@ void LogitechG815Controller::InitializeDirect() /*-----------------------------------------------------*\ | Send packet | \*-----------------------------------------------------*/ - hid_write(dev_pkt_0x11, (unsigned char *)usb_buf, 20); - hid_read(dev_pkt_0x11, (unsigned char *)usb_buf, 20); + hid_write(dev_pkt_0x11, usb_buf, 20); + hid_read(dev_pkt_0x11, usb_buf, 20); /*-----------------------------------------------------*\ | Zero out buffer | @@ -173,8 +173,8 @@ void LogitechG815Controller::InitializeDirect() /*-----------------------------------------------------*\ | Send packet | \*-----------------------------------------------------*/ - hid_write(dev_pkt_0x11, (unsigned char *)usb_buf, 20); - hid_read(dev_pkt_0x11, (unsigned char *)usb_buf, 20); + hid_write(dev_pkt_0x11, usb_buf, 20); + hid_read(dev_pkt_0x11, usb_buf, 20); } void LogitechG815Controller::SendSingleLed @@ -185,7 +185,7 @@ void LogitechG815Controller::SendSingleLed unsigned char b ) { - char usb_buf[20]; + unsigned char usb_buf[20]; /*-----------------------------------------------------*\ | Zero out buffer | @@ -209,8 +209,8 @@ void LogitechG815Controller::SendSingleLed /*-----------------------------------------------------*\ | Send packet | \*-----------------------------------------------------*/ - hid_write(dev_pkt_0x11, (unsigned char *)usb_buf, 20); - hid_read(dev_pkt_0x11, (unsigned char *)usb_buf, 20); + hid_write(dev_pkt_0x11, usb_buf, 20); + hid_read(dev_pkt_0x11, usb_buf, 20); } void LogitechG815Controller::SendDirectFrame @@ -219,7 +219,7 @@ void LogitechG815Controller::SendDirectFrame unsigned char * frame_data ) { - char usb_buf[20]; + unsigned char usb_buf[20]; /*-----------------------------------------------------*\ | Zero out buffer | @@ -242,8 +242,8 @@ void LogitechG815Controller::SendDirectFrame /*-----------------------------------------------------*\ | Send packet | \*-----------------------------------------------------*/ - hid_write(dev_pkt_0x11, (unsigned char *)usb_buf, 20); - hid_read_timeout(dev_pkt_0x11, (unsigned char *)usb_buf, 20, LOGITECH_READ_TIMEOUT); + hid_write(dev_pkt_0x11, usb_buf, 20); + hid_read_timeout(dev_pkt_0x11, usb_buf, 20, LOGITECH_READ_TIMEOUT); } void LogitechG815Controller::SendMode @@ -256,7 +256,7 @@ void LogitechG815Controller::SendMode unsigned char blue ) { - char usb_buf[20]; + unsigned char usb_buf[20]; /*-----------------------------------------------------*\ | Zero out buffer | @@ -266,7 +266,6 @@ void LogitechG815Controller::SendMode /*-----------------------------------------------------*\ | Set up Lighting Control packet | \*-----------------------------------------------------*/ - usb_buf[0x00] = 0x11; usb_buf[0x01] = 0xFF; usb_buf[0x02] = 0x0D; @@ -301,6 +300,6 @@ void LogitechG815Controller::SendMode /*-----------------------------------------------------*\ | Send packet | \*-----------------------------------------------------*/ - hid_write(dev_pkt_0x11, (unsigned char *)usb_buf, 20); - hid_read(dev_pkt_0x11, (unsigned char *)usb_buf, 20); + hid_write(dev_pkt_0x11, usb_buf, 20); + hid_read(dev_pkt_0x11, usb_buf, 20); }