diff --git a/Controllers/ASRockPolychromeSMBusController/ASRockPolychromeSMBusController.cpp b/Controllers/ASRockPolychromeSMBusController/ASRockPolychromeSMBusController.cpp index 24447edf..b9c35749 100644 --- a/Controllers/ASRockPolychromeSMBusController/ASRockPolychromeSMBusController.cpp +++ b/Controllers/ASRockPolychromeSMBusController/ASRockPolychromeSMBusController.cpp @@ -35,25 +35,25 @@ PolychromeController::PolychromeController(i2c_smbus_interface* bus, polychrome_ switch(major_version) { case ASROCK_TYPE_ASRLED: - LOG_DEBUG("Device type is ASR RGB LED"); + LOG_TRACE("%s Device type is ASR RGB LED", ASROCK_CONTROLLER_NAME); asrock_type = ASROCK_TYPE_ASRLED; memset(zone_led_count, 0, sizeof(zone_led_count)); break; case ASROCK_TYPE_POLYCHROME_V1: - LOG_DEBUG("Device type is Polychrome v1"); + LOG_TRACE("%s Device type is Polychrome v1", ASROCK_CONTROLLER_NAME); asrock_type = ASROCK_TYPE_POLYCHROME_V1; ReadLEDConfiguration(); break; case ASROCK_TYPE_POLYCHROME_V2: - LOG_DEBUG("Device type is Polychrome v2"); + LOG_TRACE("%s Device type is Polychrome v2", ASROCK_CONTROLLER_NAME); asrock_type = ASROCK_TYPE_POLYCHROME_V2; ReadLEDConfiguration(); break; default: - LOG_DEBUG("Got Unknown version!"); + LOG_TRACE("%s Got Unknown version!", ASROCK_CONTROLLER_NAME); asrock_type = ASROCK_TYPE_UNKNOWN; break; } @@ -96,7 +96,7 @@ unsigned short PolychromeController::ReadFirmwareVersion() { // The firmware register holds two bytes, so the first read should return 2 // If not, report invalid firmware revision FFFF - LOG_DEBUG("Reading back device firmware version"); + LOG_DEBUG("%s Reading back device firmware version", ASROCK_CONTROLLER_NAME); // Version response array needs to be 32 bytes to prevent non ASRock board from stack smashing unsigned char asrock_version[I2C_SMBUS_BLOCK_MAX] = { 0x00, 0x00 }; if (bus->i2c_smbus_read_block_data(dev, ASROCK_REG_FIRMWARE_VER, asrock_version) == 0x02) @@ -104,12 +104,12 @@ unsigned short PolychromeController::ReadFirmwareVersion() unsigned char major = asrock_version[0]; unsigned char minor = asrock_version[1]; - LOG_DEBUG("Device firmware version: v%02d.%02d", major, minor); + LOG_DEBUG("%s Device firmware version: v%02d.%02d", ASROCK_CONTROLLER_NAME, major, minor); return((major << 8) | minor); } else { - LOG_WARNING("Firmware readback failed; Returning 0xFFFF"); + LOG_WARNING("%s Firmware readback failed; Returning 0xFFFF", ASROCK_CONTROLLER_NAME); return(0xFFFF); } } @@ -120,7 +120,7 @@ void PolychromeController::ReadLEDConfiguration() | The LED configuration register holds 6 bytes, so the first read should return 6 | | If not, set all zone sizes to zero | \*---------------------------------------------------------------------------------*/ - LOG_DEBUG("Reading back LED config"); + LOG_DEBUG("%s Reading LED config from controller", ASROCK_CONTROLLER_NAME); unsigned char asrock_zone_count[I2C_SMBUS_BLOCK_MAX] = { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }; if (bus->i2c_smbus_read_block_data(dev, POLYCHROME_REG_LED_CONFIG, asrock_zone_count) == 0x06) { @@ -130,16 +130,16 @@ void PolychromeController::ReadLEDConfiguration() zone_led_count[POLYCHROME_ZONE_4] = asrock_zone_count[3]; zone_led_count[POLYCHROME_ZONE_5] = asrock_zone_count[4]; zone_led_count[POLYCHROME_ZONE_ADDRESSABLE] = asrock_zone_count[5]; - LOG_DEBUG("Zone 1 LED count: %02d", zone_led_count[POLYCHROME_ZONE_1]); - LOG_DEBUG("Zone 2 LED count: %02d", zone_led_count[POLYCHROME_ZONE_2]); - LOG_DEBUG("Zone 3 LED count: %02d", zone_led_count[POLYCHROME_ZONE_3]); - LOG_DEBUG("Zone 4 LED count: %02d", zone_led_count[POLYCHROME_ZONE_4]); - LOG_DEBUG("Zone 5 LED count: %02d", zone_led_count[POLYCHROME_ZONE_5]); - LOG_DEBUG("Addressable Zone LED count: %02d", zone_led_count[POLYCHROME_ZONE_ADDRESSABLE]); + LOG_DEBUG("%s Zone 1 LED count: %02d", ASROCK_CONTROLLER_NAME, zone_led_count[POLYCHROME_ZONE_1]); + LOG_DEBUG("%s Zone 2 LED count: %02d", ASROCK_CONTROLLER_NAME, zone_led_count[POLYCHROME_ZONE_2]); + LOG_DEBUG("%s Zone 3 LED count: %02d", ASROCK_CONTROLLER_NAME, zone_led_count[POLYCHROME_ZONE_3]); + LOG_DEBUG("%s Zone 4 LED count: %02d", ASROCK_CONTROLLER_NAME, zone_led_count[POLYCHROME_ZONE_4]); + LOG_DEBUG("%s Zone 5 LED count: %02d", ASROCK_CONTROLLER_NAME, zone_led_count[POLYCHROME_ZONE_5]); + LOG_DEBUG("%s Addressable Zone LED count: %02d", ASROCK_CONTROLLER_NAME, zone_led_count[POLYCHROME_ZONE_ADDRESSABLE]); } else { - LOG_WARNING("LED config read failed"); + LOG_WARNING("%s LED config read failed", ASROCK_CONTROLLER_NAME); memset(zone_led_count, 0, sizeof(zone_led_count)); } } diff --git a/Controllers/ASRockPolychromeSMBusController/ASRockPolychromeSMBusController.h b/Controllers/ASRockPolychromeSMBusController/ASRockPolychromeSMBusController.h index 00f7b32d..fd187a1e 100644 --- a/Controllers/ASRockPolychromeSMBusController/ASRockPolychromeSMBusController.h +++ b/Controllers/ASRockPolychromeSMBusController/ASRockPolychromeSMBusController.h @@ -15,6 +15,9 @@ typedef unsigned char polychrome_dev_id; +#define ASROCK_CONTROLLER_NAME "[ASRock Polychrome SMBus Controller]" +#define ASROCK_DETECTOR_NAME "[ASRock Polychrome SMBus Detect]" + enum { ASROCK_TYPE_UNKNOWN = 0x00, /* Unknown Type or Not ASRock Device */ diff --git a/Controllers/ASRockPolychromeSMBusController/ASRockPolychromeSMBusControllerDetect.cpp b/Controllers/ASRockPolychromeSMBusController/ASRockPolychromeSMBusControllerDetect.cpp index e9e0fd7b..60cd159c 100644 --- a/Controllers/ASRockPolychromeSMBusController/ASRockPolychromeSMBusControllerDetect.cpp +++ b/Controllers/ASRockPolychromeSMBusController/ASRockPolychromeSMBusControllerDetect.cpp @@ -54,24 +54,33 @@ void DetectPolychromeSMBusControllers(std::vector& busses) { IF_MOBO_SMBUS(busses[bus]->pci_vendor, busses[bus]->pci_device) { + LOG_TRACE("%s Bus %02d is an Motherboard, checking for for a device at 0x6A", ASROCK_DETECTOR_NAME, bus); // Check for Polychrome controller at 0x6A if (TestForPolychromeSMBusController(busses[bus], 0x6A)) { - LOG_DEBUG("Detected a device at address 0x6A, Testing for a known controller"); + LOG_TRACE("%s Detected a device at address 0x6A, Testing for a known controller", ASROCK_DETECTOR_NAME); new_polychrome = new PolychromeController(busses[bus], 0x6A); if(new_polychrome->GetASRockType() != ASROCK_TYPE_UNKNOWN) { - LOG_DEBUG("Found a known Polychrome device"); + LOG_TRACE("%s Found a known Polychrome device", ASROCK_DETECTOR_NAME); new_controller = new RGBController_Polychrome(new_polychrome); ResourceManager::get()->RegisterRGBController(new_controller); } else { - LOG_DEBUG("Not a Polychrome device or unknown type"); + LOG_TRACE("%s Not a Polychrome device or unknown type", ASROCK_DETECTOR_NAME); delete new_polychrome; } } + else + { + LOG_TRACE("%s Bus %02d no response at 0x6A", ASROCK_DETECTOR_NAME, bus); + } + } + else + { + LOG_TRACE("%s Bus %02d not a Motherboard", ASROCK_DETECTOR_NAME, bus); } }