|
@@ -50,14 +50,14 @@ static int irq_flags(int triggering, int polarity, int shareable)
|
|
|
flags = IORESOURCE_IRQ_HIGHEDGE;
|
|
|
}
|
|
|
|
|
|
- if (shareable)
|
|
|
+ if (shareable == ACPI_SHARED)
|
|
|
flags |= IORESOURCE_IRQ_SHAREABLE;
|
|
|
|
|
|
return flags;
|
|
|
}
|
|
|
|
|
|
static void decode_irq_flags(struct pnp_dev *dev, int flags, int *triggering,
|
|
|
- int *polarity)
|
|
|
+ int *polarity, int *shareable)
|
|
|
{
|
|
|
switch (flags & (IORESOURCE_IRQ_LOWLEVEL | IORESOURCE_IRQ_HIGHLEVEL |
|
|
|
IORESOURCE_IRQ_LOWEDGE | IORESOURCE_IRQ_HIGHEDGE)) {
|
|
@@ -84,6 +84,11 @@ static void decode_irq_flags(struct pnp_dev *dev, int flags, int *triggering,
|
|
|
*polarity = ACPI_ACTIVE_HIGH;
|
|
|
break;
|
|
|
}
|
|
|
+
|
|
|
+ if (flags & IORESOURCE_IRQ_SHAREABLE)
|
|
|
+ *shareable = ACPI_SHARED;
|
|
|
+ else
|
|
|
+ *shareable = ACPI_EXCLUSIVE;
|
|
|
}
|
|
|
|
|
|
static void pnpacpi_parse_allocated_irqresource(struct pnp_dev *dev,
|
|
@@ -796,15 +801,12 @@ static void pnpacpi_encode_irq(struct pnp_dev *dev,
|
|
|
struct resource *p)
|
|
|
{
|
|
|
struct acpi_resource_irq *irq = &resource->data.irq;
|
|
|
- int triggering, polarity;
|
|
|
+ int triggering, polarity, shareable;
|
|
|
|
|
|
- decode_irq_flags(dev, p->flags, &triggering, &polarity);
|
|
|
+ decode_irq_flags(dev, p->flags, &triggering, &polarity, &shareable);
|
|
|
irq->triggering = triggering;
|
|
|
irq->polarity = polarity;
|
|
|
- if (triggering == ACPI_EDGE_SENSITIVE)
|
|
|
- irq->sharable = ACPI_EXCLUSIVE;
|
|
|
- else
|
|
|
- irq->sharable = ACPI_SHARED;
|
|
|
+ irq->sharable = shareable;
|
|
|
irq->interrupt_count = 1;
|
|
|
irq->interrupts[0] = p->start;
|
|
|
|
|
@@ -819,16 +821,13 @@ static void pnpacpi_encode_ext_irq(struct pnp_dev *dev,
|
|
|
struct resource *p)
|
|
|
{
|
|
|
struct acpi_resource_extended_irq *extended_irq = &resource->data.extended_irq;
|
|
|
- int triggering, polarity;
|
|
|
+ int triggering, polarity, shareable;
|
|
|
|
|
|
- decode_irq_flags(dev, p->flags, &triggering, &polarity);
|
|
|
+ decode_irq_flags(dev, p->flags, &triggering, &polarity, &shareable);
|
|
|
extended_irq->producer_consumer = ACPI_CONSUMER;
|
|
|
extended_irq->triggering = triggering;
|
|
|
extended_irq->polarity = polarity;
|
|
|
- if (triggering == ACPI_EDGE_SENSITIVE)
|
|
|
- extended_irq->sharable = ACPI_EXCLUSIVE;
|
|
|
- else
|
|
|
- extended_irq->sharable = ACPI_SHARED;
|
|
|
+ extended_irq->sharable = shareable;
|
|
|
extended_irq->interrupt_count = 1;
|
|
|
extended_irq->interrupts[0] = p->start;
|
|
|
|