Changeset 948911d in mainline for kernel/arch/ia32/src/ia32.c


Ignore:
Timestamp:
2012-01-24T02:27:43Z (12 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
230385c
Parents:
8afeb04 (diff), 2df6f6fe (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:

Mainline changes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/arch/ia32/src/ia32.c

    r8afeb04 r948911d  
    168168                }
    169169        }
    170        
    171         /*
    172          * This is the necessary evil until the userspace driver is entirely
    173          * self-sufficient.
    174          */
    175         sysinfo_set_item_val("i8042", NULL, true);
    176         sysinfo_set_item_val("i8042.inr_a", NULL, IRQ_KBD);
    177         sysinfo_set_item_val("i8042.inr_b", NULL, IRQ_MOUSE);
    178         sysinfo_set_item_val("i8042.address.physical", NULL,
    179             (uintptr_t) I8042_BASE);
    180         sysinfo_set_item_val("i8042.address.kernel", NULL,
    181             (uintptr_t) I8042_BASE);
    182170#endif
    183171       
    184172        if (irqs_info != NULL)
    185173                sysinfo_set_item_val(irqs_info, NULL, true);
    186        
    187         sysinfo_set_item_val("netif.ne2000.inr", NULL, IRQ_NE2000);
    188174}
    189175
Note: See TracChangeset for help on using the changeset viewer.