hrev54052 adds 2 changesets to branch 'master'
old head: 47102c074278637c3b33935b451d53f7ad176658
new head: 898afd0a20d8ddf7939fccb0699712b9c8524c37
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=898afd0a20d8+%5E47102c074278
----------------------------------------------------------------------------
e3b7218370da: pch_i2c: implement acpi_scan_bus
Change-Id: Ib2297246ea53c9e65d602961b615c2e1f4b3478a
Reviewed-on: https://review.haiku-os.org/c/haiku/+/2480
Reviewed-by: Adrien Destugues <pulkomandy@xxxxxxxxx>
Reviewed-by: Jérôme Duval <jerome.duval@xxxxxxxxx>
898afd0a20d8: i2c: add device names
Change-Id: I1cb40223cdb43cc7069aee382657aac2b4cfd62b
Reviewed-on: https://review.haiku-os.org/c/haiku/+/2481
Reviewed-by: Adrien Destugues <pulkomandy@xxxxxxxxx>
Reviewed-by: Jérôme Duval <jerome.duval@xxxxxxxxx>
[ X512 <danger_mail@xxxxxxx> ]
----------------------------------------------------------------------------
4 files changed, 19 insertions(+), 3 deletions(-)
src/add-ons/kernel/bus_managers/i2c/I2CBus.cpp | 2 ++
src/add-ons/kernel/bus_managers/i2c/I2CModule.cpp | 1 +
src/add-ons/kernel/busses/i2c/pch_i2c_acpi.cpp | 17 +++++++++++++++--
src/add-ons/kernel/busses/i2c/pch_i2c_pci.cpp | 2 +-
############################################################################
Commit: e3b7218370dacb5a0ed044e35e2274e66d1e709f
URL: https://git.haiku-os.org/haiku/commit/?id=e3b7218370da
Author: X512 <danger_mail@xxxxxxx>
Date: Sun Apr 12 02:44:45 2020 UTC
Committer: Jérôme Duval <jerome.duval@xxxxxxxxx>
Commit-Date: Thu Apr 16 11:52:47 2020 UTC
pch_i2c: implement acpi_scan_bus
Change-Id: Ib2297246ea53c9e65d602961b615c2e1f4b3478a
Reviewed-on: https://review.haiku-os.org/c/haiku/+/2480
Reviewed-by: Adrien Destugues <pulkomandy@xxxxxxxxx>
Reviewed-by: Jérôme Duval <jerome.duval@xxxxxxxxx>
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/busses/i2c/pch_i2c_acpi.cpp
b/src/add-ons/kernel/busses/i2c/pch_i2c_acpi.cpp
index eccdc9f523..688f4dd0f3 100644
--- a/src/add-ons/kernel/busses/i2c/pch_i2c_acpi.cpp
+++ b/src/add-ons/kernel/busses/i2c/pch_i2c_acpi.cpp
@@ -60,6 +60,19 @@ pch_i2c_scan_parse_callback(ACPI_RESOURCE *res, void
*context)
// #pragma mark -
+static status_t
+acpi_scan_bus(i2c_bus_cookie cookie)
+{
+ CALLED();
+ pch_i2c_acpi_sim_info* bus = (pch_i2c_acpi_sim_info*)cookie;
+
+ bus->acpi->walk_namespace(bus->device, ACPI_TYPE_DEVICE, 1,
+ pch_i2c_scan_bus_callback, NULL, bus, NULL);
+
+ return B_OK;
+}
+
+
static status_t
register_child_devices(void* cookie)
{
@@ -110,7 +123,7 @@ init_device(device_node* node, void** device_cookie)
bus->acpi = acpi;
bus->device = device;
bus->info.driver_node = node;
- //bus->info.scan_bus = acpi_scan_bus;
+ bus->info.scan_bus = acpi_scan_bus;
// Attach devices for I2C resources
struct pch_i2c_crs crs;
############################################################################
Revision: hrev54052
Commit: 898afd0a20d8ddf7939fccb0699712b9c8524c37
URL: https://git.haiku-os.org/haiku/commit/?id=898afd0a20d8
Author: X512 <danger_mail@xxxxxxx>
Date: Thu Apr 16 01:30:40 2020 UTC
Committer: Jérôme Duval <jerome.duval@xxxxxxxxx>
Commit-Date: Thu Apr 16 11:52:47 2020 UTC
i2c: add device names
Change-Id: I1cb40223cdb43cc7069aee382657aac2b4cfd62b
Reviewed-on: https://review.haiku-os.org/c/haiku/+/2481
Reviewed-by: Adrien Destugues <pulkomandy@xxxxxxxxx>
Reviewed-by: Jérôme Duval <jerome.duval@xxxxxxxxx>
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/bus_managers/i2c/I2CBus.cpp
b/src/add-ons/kernel/bus_managers/i2c/I2CBus.cpp
index af730c8e28..8639c009a0 100644
--- a/src/add-ons/kernel/bus_managers/i2c/I2CBus.cpp
+++ b/src/add-ons/kernel/bus_managers/i2c/I2CBus.cpp
@@ -57,6 +57,8 @@ I2CBus::RegisterDevice(i2c_addr slaveAddress, char* hid,
char** cid,
CALLED();
device_attr attrs[] = {
+ { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { string: "I2C device"
}},
+
// connection
{ I2C_DEVICE_SLAVE_ADDR_ITEM, B_UINT16_TYPE, { ui16:
slaveAddress }},
diff --git a/src/add-ons/kernel/bus_managers/i2c/I2CModule.cpp
b/src/add-ons/kernel/bus_managers/i2c/I2CModule.cpp
index f8ca7c5de4..b0dac5671b 100644
--- a/src/add-ons/kernel/bus_managers/i2c/I2CModule.cpp
+++ b/src/add-ons/kernel/bus_managers/i2c/I2CModule.cpp
@@ -26,6 +26,7 @@ i2c_added_device(device_node *parent)
device_attr attributes[] = {
// info about device
+ { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { string: "I2C bus" }},
{ B_DEVICE_BUS, B_STRING_TYPE, { string: "i2c" }},
{ I2C_BUS_PATH_ID_ITEM, B_UINT8_TYPE, { ui8: (uint8)pathID }},
{ NULL }
diff --git a/src/add-ons/kernel/busses/i2c/pch_i2c_acpi.cpp
b/src/add-ons/kernel/busses/i2c/pch_i2c_acpi.cpp
index 688f4dd0f3..0664553552 100644
--- a/src/add-ons/kernel/busses/i2c/pch_i2c_acpi.cpp
+++ b/src/add-ons/kernel/busses/i2c/pch_i2c_acpi.cpp
@@ -82,7 +82,7 @@ register_child_devices(void* cookie)
device_node* node = bus->info.driver_node;
char prettyName[25];
- sprintf(prettyName, "PCH I2C Device");
+ sprintf(prettyName, "PCH I2C Controller");
device_attr attrs[] = {
// properties of this controller for i2c bus manager
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 636730e8c5..088d26e1c3 100644
--- a/src/add-ons/kernel/busses/i2c/pch_i2c_pci.cpp
+++ b/src/add-ons/kernel/busses/i2c/pch_i2c_pci.cpp
@@ -84,7 +84,7 @@ register_child_devices(void* cookie)
device_node* node = bus->info.driver_node;
char prettyName[25];
- sprintf(prettyName, "PCH I2C Device %" B_PRIu16, 0);
+ sprintf(prettyName, "PCH I2C Controller %" B_PRIu16, 0);
device_attr attrs[] = {
// properties of this controller for i2c bus manager
