doryan/BloomPatched
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved naming consistency of aliases

Browse Source
This commit is contained in:
Nav
2022-10-01 21:01:37 +01:00
parent 2c6fd25ae4
commit 065a389dfe
56 changed files with 96 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/DebugToolDrivers/USB/HID/HidInterface.hpp
View File

@@ -68,9 +68,9 @@ namespace Bloom::Usb
std::string getHidDevicePath();
private:
using HidDeviceType = std::unique_ptr<::hid_device, decltype(&::hid_close)>;
using HidDevice = std::unique_ptr<::hid_device, decltype(&::hid_close)>;
HidDeviceType hidDevice = HidDeviceType(nullptr, ::hid_close);
HidDevice hidDevice = HidDevice(nullptr, ::hid_close);
/**
* All HID reports have a fixed report length. This means that every packet we send or receive to/from an HID

6
src/DebugToolDrivers/USB/UsbDevice.cpp
View File

@@ -80,12 +80,12 @@ namespace Bloom::Usb
::libusb_free_config_descriptor(configDescriptor);
}
std::vector<LibusbDeviceType> UsbDevice::findMatchingDevices(
std::vector<LibusbDevice> UsbDevice::findMatchingDevices(
std::uint16_t vendorId, std::uint16_t productId
) {
::libusb_device** devices = nullptr;
::libusb_device* device;
std::vector<LibusbDeviceType> matchedDevices;
std::vector<LibusbDevice> matchedDevices;
auto libusbStatusCode = ::libusb_get_device_list(UsbDevice::libusbContext.get(), &devices);
if (libusbStatusCode < 0) {
@@ -96,7 +96,7 @@ namespace Bloom::Usb
ssize_t i = 0;
while ((device = devices[i++]) != nullptr) {
auto libusbDevice = LibusbDeviceType(device, ::libusb_unref_device);
auto libusbDevice = LibusbDevice(device, ::libusb_unref_device);
struct ::libusb_device_descriptor desc = {};
if ((libusbStatusCode = ::libusb_get_device_descriptor(device, &desc)) < 0) {

14
src/DebugToolDrivers/USB/UsbDevice.hpp
View File

@@ -10,9 +10,9 @@
namespace Bloom::Usb
{
using LibusbContextType = std::unique_ptr<::libusb_context, decltype(&::libusb_exit)>;
using LibusbDeviceType = std::unique_ptr<::libusb_device, decltype(&::libusb_unref_device)>;
using LibusbDeviceHandleType = std::unique_ptr<::libusb_device_handle, decltype(&::libusb_close)>;
using LibusbContext = std::unique_ptr<::libusb_context, decltype(&::libusb_exit)>;
using LibusbDevice = std::unique_ptr<::libusb_device, decltype(&::libusb_unref_device)>;
using LibusbDeviceHandle = std::unique_ptr<::libusb_device_handle, decltype(&::libusb_close)>;
class UsbDevice
{
@@ -40,12 +40,12 @@ namespace Bloom::Usb
virtual ~UsbDevice();
protected:
static inline LibusbContextType libusbContext = LibusbContextType(nullptr, ::libusb_exit);
static inline LibusbContext libusbContext = LibusbContext(nullptr, ::libusb_exit);
LibusbDeviceType libusbDevice = LibusbDeviceType(nullptr, ::libusb_unref_device);
LibusbDeviceHandleType libusbDeviceHandle = LibusbDeviceHandleType(nullptr, ::libusb_close);
LibusbDevice libusbDevice = LibusbDevice(nullptr, ::libusb_unref_device);
LibusbDeviceHandle libusbDeviceHandle = LibusbDeviceHandle(nullptr, ::libusb_close);
std::vector<LibusbDeviceType> findMatchingDevices(std::uint16_t vendorId, std::uint16_t productId);
std::vector<LibusbDevice> findMatchingDevices(std::uint16_t vendorId, std::uint16_t productId);
void detachKernelDriverFromInterface(std::uint8_t interfaceNumber);