Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset bf9da656 in mainline


Ignore:
Timestamp:
2011-10-29T19:19:08Z (9 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
Branches:
master
Children:
e8ab32f
Parents:
0dc91833 (diff), b50bf6c2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge with mainline

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • kernel/genarch/src/acpi/madt.c

    r0dc91833 rbf9da656  
    116116static int madt_irq_to_pin(unsigned int irq)
    117117{
    118         ASSERT(irq < sizeof(isa_irq_map) / sizeof(int));
     118        if (irq >= sizeof(isa_irq_map) / sizeof(int))
     119                return (int) irq;
    119120       
    120121        return isa_irq_map[irq];
     
    178179        ASSERT(override->source < sizeof(isa_irq_map) / sizeof(int));
    179180       
    180         printf("MADT: Ignoring %s entry: bus=%" PRIu8 ", source=%" PRIu8
    181             ", global_int=%" PRIu32 ", flags=%#" PRIx16 "\n",
    182             entry[override->header.type], override->bus, override->source,
    183             override->global_int, override->flags);
     181        isa_irq_map[override->source] = override->global_int;
    184182}
    185183
  • uspace/srv/hw/irc/apic/apic.c

    r0dc91833 rbf9da656  
    133133        // FIXME: get the map from the kernel, even though this may work
    134134        //        for simple cases
     135        if (irq == 0)
     136                return 2;
    135137        return irq;
    136138}
Note: See TracChangeset for help on using the changeset viewer.