From 081719c65be144641e7143a0deb1523cba8a42d0 Mon Sep 17 00:00:00 2001 From: Kasslim <32657500-Kasslim@users.noreply.gitlab.com> Date: Tue, 10 Feb 2026 21:48:49 +0100 Subject: [PATCH] Correct spelling Busses -> Buses Commits merged by Adam Honse --- .../ASRockSMBusControllerDetect.cpp | 18 +++++------ .../CorsairDRAMControllerDetect.cpp | 10 +++---- .../CrucialControllerDetect.cpp | 22 +++++++------- .../ENESMBusControllerDetect.cpp | 30 +++++++++---------- .../EVGASMBusControllerDetect.cpp | 12 ++++---- ...GigabyteRGBFusion2DRAMControllerDetect.cpp | 10 +++---- ...igabyteRGBFusion2SMBusControllerDetect.cpp | 14 ++++----- .../GigabyteRGBFusionControllerDetect.cpp | 12 ++++---- .../LEDStripController/LEDStripController.cpp | 6 ++-- ResourceManager.cpp | 2 +- ResourceManager.h | 2 +- ResourceManagerInterface.h | 2 +- i2c_smbus/Windows/i2c_smbus_amdadl.cpp | 2 +- i2c_smbus/Windows/i2c_smbus_nvapi.cpp | 2 +- qt/OpenRGBDialog/OpenRGBDialog.cpp | 2 +- .../OpenRGBHardwareIDsDialog.cpp | 10 +++---- .../OpenRGBSystemInfoPage.cpp | 18 +++++------ .../OpenRGBSystemInfoPage.h | 2 +- 18 files changed, 88 insertions(+), 88 deletions(-) diff --git a/Controllers/ASRockSMBusController/ASRockSMBusControllerDetect.cpp b/Controllers/ASRockSMBusController/ASRockSMBusControllerDetect.cpp index 451328d9..1b2d9442 100644 --- a/Controllers/ASRockSMBusController/ASRockSMBusControllerDetect.cpp +++ b/Controllers/ASRockSMBusController/ASRockSMBusControllerDetect.cpp @@ -85,31 +85,31 @@ uint16_t GetFirmwareVersion(i2c_smbus_interface* bus, uint8_t address) } } -DetectedControllers DetectASRockSMBusControllers(std::vector& busses) +DetectedControllers DetectASRockSMBusControllers(std::vector& buses) { DetectedControllers detected_controllers; - for(unsigned int bus = 0; bus < busses.size(); bus++) + for(unsigned int bus = 0; bus < buses.size(); bus++) { - IF_MOBO_SMBUS(busses[bus]->pci_vendor, busses[bus]->pci_device) + IF_MOBO_SMBUS(buses[bus]->pci_vendor, buses[bus]->pci_device) { - if(busses[bus]->pci_subsystem_vendor == ASROCK_SUB_VEN) + if(buses[bus]->pci_subsystem_vendor == ASROCK_SUB_VEN) { LOG_DEBUG(SMBUS_CHECK_DEVICE_MESSAGE_EN, ASROCK_DETECTOR_NAME, bus, VENDOR_NAME, SMBUS_ADDRESS); // Check for Polychrome controller at 0x6A - if(TestForPolychromeSMBusController(busses[bus], SMBUS_ADDRESS)) + if(TestForPolychromeSMBusController(buses[bus], SMBUS_ADDRESS)) { LOG_DEBUG("[%s] Detected a device at address 0x%02X, testing for a known controller", ASROCK_DETECTOR_NAME, SMBUS_ADDRESS); u16_to_u8 version; - version.u16 = GetFirmwareVersion(busses[bus], SMBUS_ADDRESS); + version.u16 = GetFirmwareVersion(buses[bus], SMBUS_ADDRESS); switch(version.msb) { case ASROCK_TYPE_ASRLED: { LOG_DEBUG("[%s] Found a ASR RGB LED Controller", ASROCK_DETECTOR_NAME); - ASRockASRRGBSMBusController* controller = new ASRockASRRGBSMBusController(busses[bus], SMBUS_ADDRESS); + ASRockASRRGBSMBusController* controller = new ASRockASRRGBSMBusController(buses[bus], SMBUS_ADDRESS); controller-> fw_version = version.u16; RGBController_ASRockASRRGBSMBus* rgb_controller = new RGBController_ASRockASRRGBSMBus(controller); detected_controllers.push_back(rgb_controller); @@ -119,7 +119,7 @@ DetectedControllers DetectASRockSMBusControllers(std::vector fw_version = version.u16; RGBController_ASRockPolychromeV1SMBus* rgb_controller = new RGBController_ASRockPolychromeV1SMBus(controller); detected_controllers.push_back(rgb_controller); @@ -129,7 +129,7 @@ DetectedControllers DetectASRockSMBusControllers(std::vector fw_version = version.u16; RGBController_ASRockPolychromeV2SMBus* rgb_controller = new RGBController_ASRockPolychromeV2SMBus(controller); detected_controllers.push_back(rgb_controller); diff --git a/Controllers/CorsairDRAMController/CorsairDRAMControllerDetect.cpp b/Controllers/CorsairDRAMController/CorsairDRAMControllerDetect.cpp index d83535f3..0d4228cb 100644 --- a/Controllers/CorsairDRAMController/CorsairDRAMControllerDetect.cpp +++ b/Controllers/CorsairDRAMController/CorsairDRAMControllerDetect.cpp @@ -53,13 +53,13 @@ bool TestForCorsairDRAMController(i2c_smbus_interface *bus, unsigned char addres return true; } -DetectedControllers DetectCorsairDRAMControllers(std::vector &busses) +DetectedControllers DetectCorsairDRAMControllers(std::vector &buses) { DetectedControllers detected_controllers; - for(unsigned int bus = 0; bus < busses.size(); bus++) + for(unsigned int bus = 0; bus < buses.size(); bus++) { - IF_DRAM_SMBUS(busses[bus]->pci_vendor, busses[bus]->pci_device) + IF_DRAM_SMBUS(buses[bus]->pci_vendor, buses[bus]->pci_device) { LOG_DEBUG("[%s] Testing bus %d", CORSAIR_DRAM_NAME, bus); @@ -77,9 +77,9 @@ DetectedControllers DetectCorsairDRAMControllers(std::vectori2c_smbus_write_byte_data(dev, 0x01, val); } -DetectedControllers DetectCrucialControllers(std::vector &busses) +DetectedControllers DetectCrucialControllers(std::vector &buses) { DetectedControllers detected_controllers; - for(unsigned int bus = 0; bus < busses.size(); bus++) + for(unsigned int bus = 0; bus < buses.size(); bus++) { int address_list_idx = -1; - IF_DRAM_SMBUS(busses[bus]->pci_vendor, busses[bus]->pci_device) + IF_DRAM_SMBUS(buses[bus]->pci_vendor, buses[bus]->pci_device) { for(unsigned int slot = 0; slot < 4; slot++) { - int res = busses[bus]->i2c_smbus_write_quick(0x27, I2C_SMBUS_WRITE); + int res = buses[bus]->i2c_smbus_write_quick(0x27, I2C_SMBUS_WRITE); if(res < 0) { @@ -163,7 +163,7 @@ DetectedControllers DetectCrucialControllers(std::vector & if(address_list_idx < CRUCIAL_ADDRESS_COUNT) { - res = busses[bus]->i2c_smbus_write_quick(crucial_addresses[address_list_idx], I2C_SMBUS_WRITE); + res = buses[bus]->i2c_smbus_write_quick(crucial_addresses[address_list_idx], I2C_SMBUS_WRITE); } else { @@ -174,24 +174,24 @@ DetectedControllers DetectCrucialControllers(std::vector & if(address_list_idx < CRUCIAL_ADDRESS_COUNT) { LOG_DEBUG("[%s] Remapping slot %d to address %02X", CRUCIAL_CONTROLLER_NAME, slot, crucial_addresses[address_list_idx]); - CrucialRegisterWrite(busses[bus], 0x27, 0x82EE, slot); - CrucialRegisterWrite(busses[bus], 0x27, 0x82EF, (crucial_addresses[address_list_idx] << 1)); - CrucialRegisterWrite(busses[bus], 0x27, 0x82F0, 0xF0); + CrucialRegisterWrite(buses[bus], 0x27, 0x82EE, slot); + CrucialRegisterWrite(buses[bus], 0x27, 0x82EF, (crucial_addresses[address_list_idx] << 1)); + CrucialRegisterWrite(buses[bus], 0x27, 0x82F0, 0xF0); } std::this_thread::sleep_for(1ms); } - LOG_DEBUG("[%s] In bus: %02X:%02X looking for devices at [%s]", CRUCIAL_CONTROLLER_NAME, busses[bus]->pci_vendor, busses[bus]->pci_device, TESTING_ADDRESSES); + LOG_DEBUG("[%s] In bus: %02X:%02X looking for devices at [%s]", CRUCIAL_CONTROLLER_NAME, buses[bus]->pci_vendor, buses[bus]->pci_device, TESTING_ADDRESSES); // Add Crucial controllers for(unsigned int address_list_idx = 0; address_list_idx < CRUCIAL_ADDRESS_COUNT; address_list_idx++) { LOG_DEBUG("[%s] Testing address %02X to see if there is a device there", CRUCIAL_CONTROLLER_NAME, crucial_addresses[address_list_idx]); - if(TestForCrucialController(busses[bus], crucial_addresses[address_list_idx])) + if(TestForCrucialController(buses[bus], crucial_addresses[address_list_idx])) { - CrucialController* controller = new CrucialController(busses[bus], crucial_addresses[address_list_idx]); + CrucialController* controller = new CrucialController(buses[bus], crucial_addresses[address_list_idx]); RGBController_Crucial* rgb_controller = new RGBController_Crucial(controller); detected_controllers.push_back(rgb_controller); diff --git a/Controllers/ENESMBusController/ENESMBusControllerDetect.cpp b/Controllers/ENESMBusController/ENESMBusControllerDetect.cpp index 40d198da..b46ee9d6 100644 --- a/Controllers/ENESMBusController/ENESMBusControllerDetect.cpp +++ b/Controllers/ENESMBusController/ENESMBusControllerDetect.cpp @@ -146,21 +146,21 @@ bool TestForENESMBusController(i2c_smbus_interface* bus, unsigned char address) return(pass); } -DetectedControllers DetectENESMBusDRAMControllers(std::vector &busses) +DetectedControllers DetectENESMBusDRAMControllers(std::vector &buses) { DetectedControllers detected_controllers; - for(unsigned int bus = 0; bus < busses.size(); bus++) + for(unsigned int bus = 0; bus < buses.size(); bus++) { int address_list_idx = -1; - IF_DRAM_SMBUS(busses[bus]->pci_vendor, busses[bus]->pci_device) + IF_DRAM_SMBUS(buses[bus]->pci_vendor, buses[bus]->pci_device) { LOG_DEBUG("[ENE SMBus DRAM] Remapping ENE SMBus RAM modules on 0x77"); for(unsigned int slot = 0; slot < 8; slot++) { - int res = busses[bus]->i2c_smbus_write_quick(0x77, I2C_SMBUS_WRITE); + int res = buses[bus]->i2c_smbus_write_quick(0x77, I2C_SMBUS_WRITE); if(res < 0) { @@ -176,7 +176,7 @@ DetectedControllers DetectENESMBusDRAMControllers(std::vectori2c_smbus_write_quick(ene_ram_addresses[address_list_idx], I2C_SMBUS_WRITE); + res = buses[bus]->i2c_smbus_write_quick(ene_ram_addresses[address_list_idx], I2C_SMBUS_WRITE); } else { @@ -188,17 +188,17 @@ DetectedControllers DetectENESMBusDRAMControllers(std::vector &busses) +DetectedControllers DetectENESMBusMotherboardControllers(std::vector &buses) { DetectedControllers detected_controllers; - for(unsigned int bus = 0; bus < busses.size(); bus++) + for(unsigned int bus = 0; bus < buses.size(); bus++) { // Add ENE (ASUS Aura) motherboard controllers - IF_MOBO_SMBUS(busses[bus]->pci_vendor, busses[bus]->pci_device) + IF_MOBO_SMBUS(buses[bus]->pci_vendor, buses[bus]->pci_device) { - if(busses[bus]->pci_subsystem_vendor == ASUS_SUB_VEN || busses[bus]->pci_subsystem_vendor == 0 || busses[bus]->pci_subsystem_vendor == 0xFFFF) + if(buses[bus]->pci_subsystem_vendor == ASUS_SUB_VEN || buses[bus]->pci_subsystem_vendor == 0 || buses[bus]->pci_subsystem_vendor == 0xFFFF) { for(unsigned int address_list_idx = 0; address_list_idx < AURA_MOBO_ADDRESS_COUNT; address_list_idx++) { LOG_DEBUG(SMBUS_CHECK_DEVICE_MESSAGE_EN, DETECTOR_NAME, bus, VENDOR_NAME, aura_mobo_addresses[address_list_idx]); - if(TestForENESMBusController(busses[bus], aura_mobo_addresses[address_list_idx])) + if(TestForENESMBusController(buses[bus], aura_mobo_addresses[address_list_idx])) { DMIInfo dmi; - ENESMBusInterface_i2c_smbus* interface = new ENESMBusInterface_i2c_smbus(busses[bus]); + ENESMBusInterface_i2c_smbus* interface = new ENESMBusInterface_i2c_smbus(buses[bus]); ENESMBusController* controller = new ENESMBusController(interface, aura_mobo_addresses[address_list_idx], "ASUS " + dmi.getMainboard(), DEVICE_TYPE_MOTHERBOARD); RGBController_ENESMBus* rgb_controller = new RGBController_ENESMBus(controller); diff --git a/Controllers/EVGASMBusController/EVGASMBusControllerDetect.cpp b/Controllers/EVGASMBusController/EVGASMBusControllerDetect.cpp index 63672238..a5ec08a1 100644 --- a/Controllers/EVGASMBusController/EVGASMBusControllerDetect.cpp +++ b/Controllers/EVGASMBusController/EVGASMBusControllerDetect.cpp @@ -40,21 +40,21 @@ bool TestForAcx30SMBusController(i2c_smbus_interface *bus, uint8_t address) return(pass); } -DetectedControllers DetectAcx30SMBusControllers(std::vector &busses) +DetectedControllers DetectAcx30SMBusControllers(std::vector &buses) { DetectedControllers detected_controllers; - for(unsigned int bus = 0; bus < busses.size(); bus++) + for(unsigned int bus = 0; bus < buses.size(); bus++) { - IF_MOBO_SMBUS(busses[bus]->pci_vendor, busses[bus]->pci_device) + IF_MOBO_SMBUS(buses[bus]->pci_vendor, buses[bus]->pci_device) { - if(busses[bus]->pci_subsystem_vendor == EVGA_SUB_VEN) + if(buses[bus]->pci_subsystem_vendor == EVGA_SUB_VEN) { LOG_DEBUG(SMBUS_CHECK_DEVICE_MESSAGE_EN, EVGA_DETECTOR_NAME, bus, VENDOR_NAME, SMBUS_ADDRESS); // Check for ACX 30 controller at 0x28 - if(TestForAcx30SMBusController(busses[bus], SMBUS_ADDRESS)) + if(TestForAcx30SMBusController(buses[bus], SMBUS_ADDRESS)) { - EVGAACX30SMBusController * controller = new EVGAACX30SMBusController(busses[bus], SMBUS_ADDRESS); + EVGAACX30SMBusController * controller = new EVGAACX30SMBusController(buses[bus], SMBUS_ADDRESS); RGBController_EVGAACX30SMBus * rgb_controller = new RGBController_EVGAACX30SMBus(controller); detected_controllers.push_back(rgb_controller); diff --git a/Controllers/GigabyteRGBFusion2DRAMController/GigabyteRGBFusion2DRAMControllerDetect.cpp b/Controllers/GigabyteRGBFusion2DRAMController/GigabyteRGBFusion2DRAMControllerDetect.cpp index 35528f1b..3ed6bb0f 100644 --- a/Controllers/GigabyteRGBFusion2DRAMController/GigabyteRGBFusion2DRAMControllerDetect.cpp +++ b/Controllers/GigabyteRGBFusion2DRAMController/GigabyteRGBFusion2DRAMControllerDetect.cpp @@ -48,18 +48,18 @@ bool TestForGigabyteRGBFusion2DRAMController(i2c_smbus_interface* bus, unsigned return(pass); } -DetectedControllers DetectGigabyteRGBFusion2DRAMControllers(std::vector& busses) +DetectedControllers DetectGigabyteRGBFusion2DRAMControllers(std::vector& buses) { DetectedControllers detected_controllers; - for(unsigned int bus = 0; bus < busses.size(); bus++) + for(unsigned int bus = 0; bus < buses.size(); bus++) { - IF_DRAM_SMBUS(busses[bus]->pci_vendor, busses[bus]->pci_device) + IF_DRAM_SMBUS(buses[bus]->pci_vendor, buses[bus]->pci_device) { // Check for RGB Fusion 2 DRAM controller at 0x67 - if(TestForGigabyteRGBFusion2DRAMController(busses[bus], 0x67)) + if(TestForGigabyteRGBFusion2DRAMController(buses[bus], 0x67)) { - RGBFusion2DRAMController* controller = new RGBFusion2DRAMController(busses[bus], 0x67); + RGBFusion2DRAMController* controller = new RGBFusion2DRAMController(buses[bus], 0x67); RGBController_RGBFusion2DRAM* rgb_controller = new RGBController_RGBFusion2DRAM(controller); detected_controllers.push_back(rgb_controller); diff --git a/Controllers/GigabyteRGBFusion2SMBusController/GigabyteRGBFusion2SMBusControllerDetect.cpp b/Controllers/GigabyteRGBFusion2SMBusController/GigabyteRGBFusion2SMBusControllerDetect.cpp index 4df9d815..deaabffc 100644 --- a/Controllers/GigabyteRGBFusion2SMBusController/GigabyteRGBFusion2SMBusControllerDetect.cpp +++ b/Controllers/GigabyteRGBFusion2SMBusController/GigabyteRGBFusion2SMBusControllerDetect.cpp @@ -74,7 +74,7 @@ bool TestForGigabyteRGBFusion2SMBusController(i2c_smbus_interface* bus, unsigned return(pass); } -DetectedControllers DetectGigabyteRGBFusion2SMBusControllers(std::vector& busses) +DetectedControllers DetectGigabyteRGBFusion2SMBusControllers(std::vector& buses) { DetectedControllers detected_controllers; SettingsManager* set_man = ResourceManager::get()->GetSettingsManager(); @@ -112,18 +112,18 @@ DetectedControllers DetectGigabyteRGBFusion2SMBusControllers(std::vectorpci_vendor, busses[bus]->pci_device) + IF_MOBO_SMBUS(buses[bus]->pci_vendor, buses[bus]->pci_device) { - if(busses[bus]->pci_subsystem_vendor == GIGABYTE_SUB_VEN) + if(buses[bus]->pci_subsystem_vendor == GIGABYTE_SUB_VEN) { /*-------------------------------------*\ | TODO - Is this necessary? Or an | | artifact of my own system? Skip dmcd | | devices | \*-------------------------------------*/ - std::string device_name = std::string(busses[bus]->device_name); + std::string device_name = std::string(buses[bus]->device_name); if(device_name.find("dmdc") == std::string::npos) { @@ -133,9 +133,9 @@ DetectedControllers DetectGigabyteRGBFusion2SMBusControllers(std::vector& busses) +DetectedControllers DetectGigabyteRGBFusionControllers(std::vector& buses) { DetectedControllers detected_controllers; - for(unsigned int bus = 0; bus < busses.size(); bus++) + for(unsigned int bus = 0; bus < buses.size(); bus++) { - IF_MOBO_SMBUS(busses[bus]->pci_vendor, busses[bus]->pci_device) + IF_MOBO_SMBUS(buses[bus]->pci_vendor, buses[bus]->pci_device) { - if(busses[bus]->pci_subsystem_vendor == GIGABYTE_SUB_VEN) + if(buses[bus]->pci_subsystem_vendor == GIGABYTE_SUB_VEN) { LOG_DEBUG(SMBUS_CHECK_DEVICE_MESSAGE_EN, DETECTOR_NAME, bus, VENDOR_NAME, SMBUS_ADDRESS); /*-----------------------------------------*\ | Check for RGB Fusion controller at 0x28 | \*-----------------------------------------*/ - if(TestForGigabyteRGBFusionController(busses[bus], SMBUS_ADDRESS)) + if(TestForGigabyteRGBFusionController(buses[bus], SMBUS_ADDRESS)) { - RGBFusionController* controller = new RGBFusionController(busses[bus], SMBUS_ADDRESS); + RGBFusionController* controller = new RGBFusionController(buses[bus], SMBUS_ADDRESS); RGBController_RGBFusion* rgb_controller = new RGBController_RGBFusion(controller); detected_controllers.push_back(rgb_controller); diff --git a/Controllers/LEDStripController/LEDStripController.cpp b/Controllers/LEDStripController/LEDStripController.cpp index d9fc27c2..81d4e62c 100644 --- a/Controllers/LEDStripController/LEDStripController.cpp +++ b/Controllers/LEDStripController/LEDStripController.cpp @@ -102,13 +102,13 @@ void LEDStripController::Initialize(char* ledstring, led_protocol proto) void LEDStripController::InitializeI2C(char* i2cname) { - for(unsigned int i2c_idx = 0; i2c_idx < ResourceManager::get()->GetI2CBusses().size(); i2c_idx++) + for(unsigned int i2c_idx = 0; i2c_idx < ResourceManager::get()->GetI2CBuses().size(); i2c_idx++) { - if(ResourceManager::get()->GetI2CBusses()[i2c_idx]->device_name == std::string(i2cname)) + if(ResourceManager::get()->GetI2CBuses()[i2c_idx]->device_name == std::string(i2cname)) { if(i2c_addr < 128) { - i2cport = ResourceManager::get()->GetI2CBusses()[i2c_idx]; + i2cport = ResourceManager::get()->GetI2CBuses()[i2c_idx]; break; } } diff --git a/ResourceManager.cpp b/ResourceManager.cpp index f09a00bc..7bc6066a 100644 --- a/ResourceManager.cpp +++ b/ResourceManager.cpp @@ -224,7 +224,7 @@ filesystem::path ResourceManager::GetConfigurationDirectory() return(config_dir); } -std::vector & ResourceManager::GetI2CBusses() +std::vector & ResourceManager::GetI2CBuses() { return DetectionManager::get()->GetI2CBuses(); } diff --git a/ResourceManager.h b/ResourceManager.h index 446599c8..4135dd8f 100644 --- a/ResourceManager.h +++ b/ResourceManager.h @@ -53,7 +53,7 @@ public: std::vector& GetClients(); filesystem::path GetConfigurationDirectory(); LogManager* GetLogManager(); - std::vector& GetI2CBusses(); + std::vector& GetI2CBuses(); PluginManagerInterface* GetPluginManager(); ProfileManager* GetProfileManager(); std::vector& GetRGBControllers(); diff --git a/ResourceManagerInterface.h b/ResourceManagerInterface.h index ff7ff61d..bb7a445f 100644 --- a/ResourceManagerInterface.h +++ b/ResourceManagerInterface.h @@ -47,7 +47,7 @@ public: \*-----------------------------------------------------*/ virtual filesystem::path GetConfigurationDirectory() = 0; virtual LogManager* GetLogManager() = 0; - virtual std::vector & GetI2CBusses() = 0; + virtual std::vector & GetI2CBuses() = 0; virtual PluginManagerInterface* GetPluginManager() = 0; virtual ProfileManager* GetProfileManager() = 0; virtual std::vector & GetRGBControllers() = 0; diff --git a/i2c_smbus/Windows/i2c_smbus_amdadl.cpp b/i2c_smbus/Windows/i2c_smbus_amdadl.cpp index e781d08b..1282149b 100644 --- a/i2c_smbus/Windows/i2c_smbus_amdadl.cpp +++ b/i2c_smbus/Windows/i2c_smbus_amdadl.cpp @@ -304,6 +304,6 @@ bool i2c_smbus_amdadl_detect() } return(true); -} /* DetectAMDADLI2CBusses() */ +} /* DetectAMDADLI2CBuses() */ REGISTER_I2C_BUS_DETECTOR(i2c_smbus_amdadl_detect); diff --git a/i2c_smbus/Windows/i2c_smbus_nvapi.cpp b/i2c_smbus/Windows/i2c_smbus_nvapi.cpp index 6bff1c66..65a0a97e 100644 --- a/i2c_smbus/Windows/i2c_smbus_nvapi.cpp +++ b/i2c_smbus/Windows/i2c_smbus_nvapi.cpp @@ -199,6 +199,6 @@ bool i2c_smbus_nvapi_detect() } return(true); -} /* DetectNvAPII2CBusses() */ +} /* DetectNvAPII2CBuses() */ REGISTER_I2C_BUS_DETECTOR(i2c_smbus_nvapi_detect); diff --git a/qt/OpenRGBDialog/OpenRGBDialog.cpp b/qt/OpenRGBDialog/OpenRGBDialog.cpp index 9405fa1d..a11c55dd 100644 --- a/qt/OpenRGBDialog/OpenRGBDialog.cpp +++ b/qt/OpenRGBDialog/OpenRGBDialog.cpp @@ -838,7 +838,7 @@ void OpenRGBDialog::AddI2CToolsPage() /*-----------------------------------------------------*\ | Create the I2C Tools page if it doesn't exist yet | \*-----------------------------------------------------*/ - SMBusToolsPage = new OpenRGBSystemInfoPage(ResourceManager::get()->GetI2CBusses()); + SMBusToolsPage = new OpenRGBSystemInfoPage(ResourceManager::get()->GetI2CBuses()); /*-----------------------------------------------------*\ | Create the I2C Tools tab in the Information bar | diff --git a/qt/OpenRGBHardwareIDsDialog/OpenRGBHardwareIDsDialog.cpp b/qt/OpenRGBHardwareIDsDialog/OpenRGBHardwareIDsDialog.cpp index f47cf3ae..30e2cdb7 100644 --- a/qt/OpenRGBHardwareIDsDialog/OpenRGBHardwareIDsDialog.cpp +++ b/qt/OpenRGBHardwareIDsDialog/OpenRGBHardwareIDsDialog.cpp @@ -35,15 +35,15 @@ OpenRGBHardwareIDsDialog::~OpenRGBHardwareIDsDialog() int OpenRGBHardwareIDsDialog::show() { /*---------------------------------------------------------*\ - | Add i2c busses infos | + | Add i2c buses infos | \*---------------------------------------------------------*/ - std::vector i2CBusses = ResourceManager::get()->GetI2CBusses(); + std::vector i2c_buses = ResourceManager::get()->GetI2CBuses(); // The widget takes control over items after creation - QTreeWidgetItem* i2c_top = new QTreeWidgetItem(ui->HardwareIdsList, {"i2c busses"}); - strings.push_back("[ i2c busses ]"); + QTreeWidgetItem* i2c_top = new QTreeWidgetItem(ui->HardwareIdsList, {"i2c buses"}); + strings.push_back("[ i2c buses ]"); - for(i2c_smbus_interface* bus : i2CBusses) + for(i2c_smbus_interface* bus : i2c_buses) { char line[550]; snprintf(line, 550, "%04X:%04X %04X:%04X", bus->pci_vendor, bus->pci_device, bus->pci_subsystem_vendor, bus->pci_subsystem_device); diff --git a/qt/OpenRGBSystemInfoPage/OpenRGBSystemInfoPage.cpp b/qt/OpenRGBSystemInfoPage/OpenRGBSystemInfoPage.cpp index 445706f9..ff6d3df4 100644 --- a/qt/OpenRGBSystemInfoPage/OpenRGBSystemInfoPage.cpp +++ b/qt/OpenRGBSystemInfoPage/OpenRGBSystemInfoPage.cpp @@ -27,7 +27,7 @@ static void OpenRGBSystemInfoPageResourceManagerCallback(void * this_ptr, unsign OpenRGBSystemInfoPage::OpenRGBSystemInfoPage(std::vector& bus, QWidget *parent) : QFrame(parent), ui(new Ui::OpenRGBSystemInfoPage), - busses(bus) + buses(bus) { ui->setupUi(this); @@ -81,9 +81,9 @@ void OpenRGBSystemInfoPage::UpdateBusList() \*-----------------------------------------------------*/ ui->SMBusAdaptersBox->clear(); - for (std::size_t i = 0; i < busses.size(); i++) + for (std::size_t i = 0; i < buses.size(); i++) { - ui->SMBusAdaptersBox->addItem(busses[i]->device_name); + ui->SMBusAdaptersBox->addItem(buses[i]->device_name); } ui->SMBusAdaptersBox->setCurrentIndex(0); @@ -98,9 +98,9 @@ void OpenRGBSystemInfoPage::on_DetectButton_clicked() current_index = 0; } - if((int)(busses.size()) > current_index) + if((int)(buses.size()) > current_index) { - i2c_smbus_interface* bus = busses[current_index]; + i2c_smbus_interface* bus = buses[current_index]; switch(ui->SMBusDetectionModeBox->currentIndex()) { @@ -132,9 +132,9 @@ void OpenRGBSystemInfoPage::on_DumpButton_clicked() current_index = 0; } - if((int)(busses.size()) > current_index) + if((int)(buses.size()) > current_index) { - i2c_smbus_interface* bus = busses[current_index]; + i2c_smbus_interface* bus = buses[current_index]; unsigned char address = ui->DumpAddressBox->value(); ui->SMBusDataText->setPlainText(i2c_dump(bus, address).c_str()); @@ -150,9 +150,9 @@ void OpenRGBSystemInfoPage::on_ReadButton_clicked() current_index = 0; } - if((int)(busses.size()) > current_index) + if((int)(buses.size()) > current_index) { - i2c_smbus_interface* bus = busses[current_index]; + i2c_smbus_interface* bus = buses[current_index]; unsigned char address = ui->ReadAddressBox->value(); unsigned char regaddr = ui->ReadRegisterBox->value(); unsigned char size = ui->ReadSizeBox->value(); diff --git a/qt/OpenRGBSystemInfoPage/OpenRGBSystemInfoPage.h b/qt/OpenRGBSystemInfoPage/OpenRGBSystemInfoPage.h index 538ba898..5386ec38 100644 --- a/qt/OpenRGBSystemInfoPage/OpenRGBSystemInfoPage.h +++ b/qt/OpenRGBSystemInfoPage/OpenRGBSystemInfoPage.h @@ -38,5 +38,5 @@ private slots: private: Ui::OpenRGBSystemInfoPage *ui; - std::vector& busses; + std::vector& buses; };