From Fredrik Holmqvist <fredrik.holmqvist@xxxxxxxxx>:
Fredrik Holmqvist has uploaded this change for review. (
https://review.haiku-os.org/c/haiku/+/3721 ;)
Change subject: ACPICA fixed its spelling of shareable
......................................................................
ACPICA fixed its spelling of shareable
---
M src/add-ons/kernel/busses/i2c/pch_i2c.cpp
M src/add-ons/kernel/busses/i2c/pch_i2c.h
M src/add-ons/kernel/busses/i2c/pch_i2c_acpi.cpp
M src/system/kernel/arch/x86/irq_routing_table.cpp
4 files changed, 11 insertions(+), 11 deletions(-)
git pull ssh://git.haiku-os.org:22/haiku refs/changes/21/3721/1
diff --git a/src/add-ons/kernel/busses/i2c/pch_i2c.cpp
b/src/add-ons/kernel/busses/i2c/pch_i2c.cpp
index 491685e..302c280 100644
--- a/src/add-ons/kernel/busses/i2c/pch_i2c.cpp
+++ b/src/add-ons/kernel/busses/i2c/pch_i2c.cpp
@@ -269,12 +269,12 @@
crs->irq = res->Data.Irq.Interrupts[0];
crs->irq_triggering = res->Data.Irq.Triggering;
crs->irq_polarity = res->Data.Irq.Polarity;
- crs->irq_sharable = res->Data.Irq.Sharable;
+ crs->irq_shareable = res->Data.Irq.Shareable;
} else if (res->Type == ACPI_RESOURCE_TYPE_EXTENDED_IRQ) {
crs->irq = res->Data.ExtendedIrq.Interrupts[0];
crs->irq_triggering = res->Data.ExtendedIrq.Triggering;
crs->irq_polarity = res->Data.ExtendedIrq.Polarity;
- crs->irq_sharable = res->Data.ExtendedIrq.Sharable;
+ crs->irq_shareable = res->Data.ExtendedIrq.Shareable;
}
return B_OK;
diff --git a/src/add-ons/kernel/busses/i2c/pch_i2c.h
b/src/add-ons/kernel/busses/i2c/pch_i2c.h
index efd5303..6c64fae 100644
--- a/src/add-ons/kernel/busses/i2c/pch_i2c.h
+++ b/src/add-ons/kernel/busses/i2c/pch_i2c.h
@@ -56,7 +56,7 @@
uint8 irq;
uint8 irq_triggering;
uint8 irq_polarity;
- uint8 irq_sharable;
+ uint8 irq_shareable;
uint32 addr_bas;
uint32 addr_len;
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 742c627..bfa7d11 100644
--- a/src/add-ons/kernel/busses/i2c/pch_i2c_acpi.cpp
+++ b/src/add-ons/kernel/busses/i2c/pch_i2c_acpi.cpp
@@ -42,12 +42,12 @@
crs->irq = res->Data.Irq.Interrupts[0];
crs->irq_triggering = res->Data.Irq.Triggering;
crs->irq_polarity = res->Data.Irq.Polarity;
- crs->irq_sharable = res->Data.Irq.Sharable;
+ crs->irq_shareable = res->Data.Irq.Shareable;
} else if (res->Type == ACPI_RESOURCE_TYPE_EXTENDED_IRQ) {
crs->irq = res->Data.ExtendedIrq.Interrupts[0];
crs->irq_triggering = res->Data.ExtendedIrq.Triggering;
crs->irq_polarity = res->Data.ExtendedIrq.Polarity;
- crs->irq_sharable = res->Data.ExtendedIrq.Sharable;
+ crs->irq_shareable = res->Data.ExtendedIrq.Shareable;
} else if (res->Type == ACPI_RESOURCE_TYPE_FIXED_MEMORY32) {
crs->addr_bas = res->Data.FixedMemory32.Address;
crs->addr_len = res->Data.FixedMemory32.AddressLength;
diff --git a/src/system/kernel/arch/x86/irq_routing_table.cpp
b/src/system/kernel/arch/x86/irq_routing_table.cpp
index f810ed0..759052b 100644
--- a/src/system/kernel/arch/x86/irq_routing_table.cpp
+++ b/src/system/kernel/arch/x86/irq_routing_table.cpp
@@ -911,7 +911,7 @@
break;
}
- descriptor.shareable = irq.Sharable != 0;
+ descriptor.shareable = irq.Shareable != 0;
descriptor.trigger_mode = irq.Triggering == 0
? B_LEVEL_TRIGGERED : B_EDGE_TRIGGERED;
descriptor.polarity = irq.Polarity == 0
@@ -933,7 +933,7 @@
irq.Triggering == 0 ? "level" : "edge");
dprintf("\tpolarity: %s active\n",
irq.Polarity == 0 ? "high" : "low");
- dprintf("\tsharable: %s\n", irq.Sharable != 0 ?
"yes" : "no");
+ dprintf("\tshareable: %s\n", irq.Shareable != 0
? "yes" : "no");
dprintf("\tcount: %u\n", irq.InterruptCount);
if (irq.InterruptCount > 0) {
dprintf("\tinterrupts:");
@@ -953,7 +953,7 @@
break;
}
- descriptor.shareable = irq.Sharable != 0;
+ descriptor.shareable = irq.Shareable != 0;
descriptor.trigger_mode = irq.Triggering == 0
? B_LEVEL_TRIGGERED : B_EDGE_TRIGGERED;
descriptor.polarity = irq.Polarity == 0
@@ -977,7 +977,7 @@
irq.Triggering == 0 ? "level" : "edge");
dprintf("\tpolarity: %s active\n",
irq.Polarity == 0 ? "high" : "low");
- dprintf("\tsharable: %s\n", irq.Sharable != 0 ?
"yes" : "no");
+ dprintf("\tshareable: %s\n", irq.Shareable != 0
? "yes" : "no");
dprintf("\tcount: %u\n", irq.InterruptCount);
if (irq.InterruptCount > 0) {
dprintf("\tinterrupts:");
@@ -1054,7 +1054,7 @@
= descriptor.trigger_mode ==
B_LEVEL_TRIGGERED ? 0 : 1;
irq.Polarity
= descriptor.polarity ==
B_HIGH_ACTIVE_POLARITY ? 0 : 1;
- irq.Sharable = descriptor.shareable ? 0 : 1;
+ irq.Shareable = descriptor.shareable ? 0 : 1;
irq.InterruptCount = 1;
irq.Interrupts[0] = descriptor.irq;
@@ -1074,7 +1074,7 @@
= descriptor.trigger_mode ==
B_LEVEL_TRIGGERED ? 0 : 1;
irq.Polarity
= descriptor.polarity ==
B_HIGH_ACTIVE_POLARITY ? 0 : 1;
- irq.Sharable = descriptor.shareable ? 0 : 1;
+ irq.Shareable = descriptor.shareable ? 0 : 1;
irq.InterruptCount = 1;
irq.Interrupts[0] = descriptor.irq;
--
To view, visit https://review.haiku-os.org/c/haiku/+/3721
To unsubscribe, or for help writing mail filters, visit
https://review.haiku-os.org/settings
Gerrit-Project: haiku
Gerrit-Branch: master
Gerrit-Change-Id: I430304cb14a5d09808537b8490dea0f2b1e237f5
Gerrit-Change-Number: 3721
Gerrit-PatchSet: 1
Gerrit-Owner: Fredrik Holmqvist <fredrik.holmqvist@xxxxxxxxx>
Gerrit-MessageType: newchange
