From 1da90c98f23a1bb972827c8c4f7720afb4dd4679 Mon Sep 17 00:00:00 2001 From: PulkoMandy Date: Fri, 22 Apr 2022 18:39:05 +0200 Subject: [PATCH] Enable and fix WError in add-ons/kernel/busses/ Change-Id: I94e1580444faffdfc362dc8f59c39152d67a7076 Reviewed-on: https://review.haiku-os.org/c/haiku/+/5235 Tested-by: Commit checker robot Reviewed-by: Adrien Destugues --- build/jam/ArchitectureRules | 9 +-------- src/add-ons/kernel/busses/i2c/pch_i2c.cpp | 1 - src/add-ons/kernel/busses/i2c/pch_i2c_pci.cpp | 6 ++++-- src/add-ons/kernel/busses/mmc/sdhci_pci.h | 2 +- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules index 7ff0b35718..a166db50fc 100644 --- a/build/jam/ArchitectureRules +++ b/build/jam/ArchitectureRules @@ -665,14 +665,7 @@ rule ArchitectureSetupWarnings architecture EnableWerror src add-ons input_server ; EnableWerror src add-ons kernel bluetooth ; EnableWerror src add-ons kernel bus_managers ; - EnableWerror src add-ons kernel busses agp_gart ; - EnableWerror src add-ons kernel busses ata ; -# EnableWerror src add-ons kernel busses i2c ; -# EnableWerror src add-ons kernel busses mmc ; -# EnableWerror src add-ons kernel busses random ; - EnableWerror src add-ons kernel busses scsi ; - EnableWerror src add-ons kernel busses usb ; -# EnableWerror src add-ons kernel busses virtio ; + EnableWerror src add-ons kernel busses ; EnableWerror src add-ons kernel console ; EnableWerror src add-ons kernel cpu ; EnableWerror src add-ons kernel debugger ; diff --git a/src/add-ons/kernel/busses/i2c/pch_i2c.cpp b/src/add-ons/kernel/busses/i2c/pch_i2c.cpp index ef2ada1a43..9b4af653f6 100644 --- a/src/add-ons/kernel/busses/i2c/pch_i2c.cpp +++ b/src/add-ons/kernel/busses/i2c/pch_i2c.cpp @@ -345,7 +345,6 @@ pch_i2c_scan_bus_callback(acpi_handle object, uint32 nestingLevel, return status; } - device_node* deviceNode; status = gI2c->register_device(bus->sim, crs.i2c_addr, hid, cidList, object); free(hid); diff --git a/src/add-ons/kernel/busses/i2c/pch_i2c_pci.cpp b/src/add-ons/kernel/busses/i2c/pch_i2c_pci.cpp index c113ca0a77..3f6a210f34 100644 --- a/src/add-ons/kernel/busses/i2c/pch_i2c_pci.cpp +++ b/src/add-ons/kernel/busses/i2c/pch_i2c_pci.cpp @@ -389,11 +389,13 @@ supports_device(device_node* parent) pci_device* device; gDeviceManager->get_driver(parent, (driver_module_info**)&pci, (void**)&device); +#ifdef TRACE_PCH_I2C uint8 pciSubDeviceId = pci->read_pci_config(device, PCI_revision, 1); - TRACE("PCH I2C device found! vendor 0x%04x, device 0x%04x\n", vendorID, - deviceID); + TRACE("PCH I2C device found! vendor 0x%04x, device 0x%04x, subdevice 0x%02x\n", vendorID, + deviceID, pciSubDeviceId); +#endif return 0.8f; } diff --git a/src/add-ons/kernel/busses/mmc/sdhci_pci.h b/src/add-ons/kernel/busses/mmc/sdhci_pci.h index 76285922b6..3a04de6df4 100644 --- a/src/add-ons/kernel/busses/mmc/sdhci_pci.h +++ b/src/add-ons/kernel/busses/mmc/sdhci_pci.h @@ -210,7 +210,7 @@ class Capabilities static const uint8_t k1v8 = 4; private: - const uint64_t fBits; + uint64_t fBits; } __attribute__((packed));