Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ACPICA fixed its spelling of shareable

Browse Source 
Change-Id: I430304cb14a5d09808537b8490dea0f2b1e237f5
Reviewed-on: https://review.haiku-os.org/c/haiku/+/3721
Reviewed-by: Fredrik Holmqvist <fredrik.holmqvist@gmail.com>
This commit is contained in:
Fredrik Holmqvist 2021-01-31 16:06:37 +01:00
parent c1e4908d9e
commit 5e6773d56a
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/add-ons/kernel/busses/i2c/pch_i2c.cpp
View File

@ -269,12 +269,12 @@ pch_i2c_scan_parse_callback(ACPI_RESOURCE *res, void *context)
crs->irq = res->Data.Irq.Interrupts[0]; crs->irq = res->Data.Irq.Interrupts[0];
crs->irq_triggering = res->Data.Irq.Triggering; crs->irq_triggering = res->Data.Irq.Triggering;
crs->irq_polarity = res->Data.Irq.Polarity; 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) { } else if (res->Type == ACPI_RESOURCE_TYPE_EXTENDED_IRQ) {
crs->irq = res->Data.ExtendedIrq.Interrupts[0]; crs->irq = res->Data.ExtendedIrq.Interrupts[0];
crs->irq_triggering = res->Data.ExtendedIrq.Triggering; crs->irq_triggering = res->Data.ExtendedIrq.Triggering;
crs->irq_polarity = res->Data.ExtendedIrq.Polarity; crs->irq_polarity = res->Data.ExtendedIrq.Polarity;
crs->irq_sharable = res->Data.ExtendedIrq.Sharable; crs->irq_shareable = res->Data.ExtendedIrq.Shareable;
} }
return B_OK; return B_OK;

2
src/add-ons/kernel/busses/i2c/pch_i2c.h
View File

@ -56,7 +56,7 @@ struct pch_i2c_crs {
uint8 irq; uint8 irq;
uint8 irq_triggering; uint8 irq_triggering;
uint8 irq_polarity; uint8 irq_polarity;
uint8 irq_sharable; uint8 irq_shareable;
uint32 addr_bas; uint32 addr_bas;
uint32 addr_len; uint32 addr_len;

4
src/add-ons/kernel/busses/i2c/pch_i2c_acpi.cpp
View File

@ -42,12 +42,12 @@ pch_i2c_scan_parse_callback(ACPI_RESOURCE *res, void *context)
crs->irq = res->Data.Irq.Interrupts[0]; crs->irq = res->Data.Irq.Interrupts[0];
crs->irq_triggering = res->Data.Irq.Triggering; crs->irq_triggering = res->Data.Irq.Triggering;
crs->irq_polarity = res->Data.Irq.Polarity; 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) { } else if (res->Type == ACPI_RESOURCE_TYPE_EXTENDED_IRQ) {
crs->irq = res->Data.ExtendedIrq.Interrupts[0]; crs->irq = res->Data.ExtendedIrq.Interrupts[0];
crs->irq_triggering = res->Data.ExtendedIrq.Triggering; crs->irq_triggering = res->Data.ExtendedIrq.Triggering;
crs->irq_polarity = res->Data.ExtendedIrq.Polarity; 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) { } else if (res->Type == ACPI_RESOURCE_TYPE_FIXED_MEMORY32) {
crs->addr_bas = res->Data.FixedMemory32.Address; crs->addr_bas = res->Data.FixedMemory32.Address;
crs->addr_len = res->Data.FixedMemory32.AddressLength; crs->addr_len = res->Data.FixedMemory32.AddressLength;

12
src/system/kernel/arch/x86/irq_routing_table.cpp
View File

@ -911,7 +911,7 @@ read_irq_descriptor(acpi_module_info* acpi, acpi_handle device,
break; break;
} }
descriptor.shareable = irq.Sharable != 0; descriptor.shareable = irq.Shareable != 0;
descriptor.trigger_mode = irq.Triggering == 0 descriptor.trigger_mode = irq.Triggering == 0
? B_LEVEL_TRIGGERED : B_EDGE_TRIGGERED; ? B_LEVEL_TRIGGERED : B_EDGE_TRIGGERED;
descriptor.polarity = irq.Polarity == 0 descriptor.polarity = irq.Polarity == 0
@ -933,7 +933,7 @@ read_irq_descriptor(acpi_module_info* acpi, acpi_handle device,
irq.Triggering == 0 ? "level" : "edge"); irq.Triggering == 0 ? "level" : "edge");
dprintf("\tpolarity: %s active\n", dprintf("\tpolarity: %s active\n",
irq.Polarity == 0 ? "high" : "low"); 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); dprintf("\tcount: %u\n", irq.InterruptCount);
if (irq.InterruptCount > 0) { if (irq.InterruptCount > 0) {
dprintf("\tinterrupts:"); dprintf("\tinterrupts:");
@ -953,7 +953,7 @@ read_irq_descriptor(acpi_module_info* acpi, acpi_handle device,
break; break;
} }
descriptor.shareable = irq.Sharable != 0; descriptor.shareable = irq.Shareable != 0;
descriptor.trigger_mode = irq.Triggering == 0 descriptor.trigger_mode = irq.Triggering == 0
? B_LEVEL_TRIGGERED : B_EDGE_TRIGGERED; ? B_LEVEL_TRIGGERED : B_EDGE_TRIGGERED;
descriptor.polarity = irq.Polarity == 0 descriptor.polarity = irq.Polarity == 0
@ -977,7 +977,7 @@ read_irq_descriptor(acpi_module_info* acpi, acpi_handle device,
irq.Triggering == 0 ? "level" : "edge"); irq.Triggering == 0 ? "level" : "edge");
dprintf("\tpolarity: %s active\n", dprintf("\tpolarity: %s active\n",
irq.Polarity == 0 ? "high" : "low"); 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); dprintf("\tcount: %u\n", irq.InterruptCount);
if (irq.InterruptCount > 0) { if (irq.InterruptCount > 0) {
dprintf("\tinterrupts:"); dprintf("\tinterrupts:");
@ -1054,7 +1054,7 @@ set_current_irq(acpi_module_info* acpi, acpi_handle device,
= descriptor.trigger_mode == B_LEVEL_TRIGGERED ? 0 : 1; = descriptor.trigger_mode == B_LEVEL_TRIGGERED ? 0 : 1;
irq.Polarity irq.Polarity
= descriptor.polarity == B_HIGH_ACTIVE_POLARITY ? 0 : 1; = descriptor.polarity == B_HIGH_ACTIVE_POLARITY ? 0 : 1;
irq.Sharable = descriptor.shareable ? 0 : 1; irq.Shareable = descriptor.shareable ? 0 : 1;
irq.InterruptCount = 1; irq.InterruptCount = 1;
irq.Interrupts[0] = descriptor.irq; irq.Interrupts[0] = descriptor.irq;
@ -1074,7 +1074,7 @@ set_current_irq(acpi_module_info* acpi, acpi_handle device,
= descriptor.trigger_mode == B_LEVEL_TRIGGERED ? 0 : 1; = descriptor.trigger_mode == B_LEVEL_TRIGGERED ? 0 : 1;
irq.Polarity irq.Polarity
= descriptor.polarity == B_HIGH_ACTIVE_POLARITY ? 0 : 1; = descriptor.polarity == B_HIGH_ACTIVE_POLARITY ? 0 : 1;
irq.Sharable = descriptor.shareable ? 0 : 1; irq.Shareable = descriptor.shareable ? 0 : 1;
irq.InterruptCount = 1; irq.InterruptCount = 1;
irq.Interrupts[0] = descriptor.irq; irq.Interrupts[0] = descriptor.irq;