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

Changeset 88dfee7 in mainline


Ignore:
Timestamp:
2012-01-23T18:23:25Z (8 years ago)
Author:
Martin Decky <martin@…>
Branches:
master
Children:
2df6f6fe
Parents:
c1f27f1d
Message:

get rid of unnecessary legacy code

Location:
kernel/arch
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • kernel/arch/amd64/include/interrupt.h

    rc1f27f1d r88dfee7  
    5555#define IRQ_PIC_SPUR  7
    5656#define IRQ_MOUSE     12
    57 #define IRQ_NE2000    9
    5857
    5958/* This one must have four least significant bits set to ones */
  • kernel/arch/amd64/src/amd64.c

    rc1f27f1d r88dfee7  
    214214                }
    215215        }
    216        
    217         /*
    218          * This is the necessary evil until the userspace driver is entirely
    219          * self-sufficient.
    220          */
    221         sysinfo_set_item_val("i8042", NULL, true);
    222         sysinfo_set_item_val("i8042.inr_a", NULL, IRQ_KBD);
    223         sysinfo_set_item_val("i8042.inr_b", NULL, IRQ_MOUSE);
    224         sysinfo_set_item_val("i8042.address.physical", NULL,
    225             (uintptr_t) I8042_BASE);
    226         sysinfo_set_item_val("i8042.address.kernel", NULL,
    227             (uintptr_t) I8042_BASE);
    228216#endif
    229217       
    230218        if (irqs_info != NULL)
    231219                sysinfo_set_item_val(irqs_info, NULL, true);
    232        
    233         sysinfo_set_item_val("netif.ne2000.inr", NULL, IRQ_NE2000);
    234220}
    235221
  • kernel/arch/ia32/include/interrupt.h

    rc1f27f1d r88dfee7  
    5555#define IRQ_PIC_SPUR  7
    5656#define IRQ_MOUSE     12
    57 #define IRQ_NE2000    5
    5857
    5958/* This one must have four least significant bits set to ones */
  • kernel/arch/ia32/src/ia32.c

    rc1f27f1d r88dfee7  
    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
  • kernel/arch/ia64/include/interrupt.h

    rc1f27f1d r88dfee7  
    6161#define IRQ_KBD    (0x01 + LEGACY_INTERRUPT_BASE)
    6262#define IRQ_MOUSE  (0x0c + LEGACY_INTERRUPT_BASE)
    63 #define IRQ_NE2000 (0x09 + LEGACY_INTERRUPT_BASE)
    6463
    6564/** General Exception codes. */
  • kernel/arch/ia64/src/ia64.c

    rc1f27f1d r88dfee7  
    188188       
    189189#ifdef CONFIG_I8042
    190         i8042_instance_t *i8042_instance = i8042_init((i8042_t *) I8042_BASE, IRQ_KBD);
     190        i8042_instance_t *i8042_instance = i8042_init((i8042_t *) I8042_BASE,
     191            IRQ_KBD);
    191192        if (i8042_instance) {
    192193                kbrd_instance_t *kbrd_instance = kbrd_init();
     
    197198                }
    198199        }
    199        
    200         sysinfo_set_item_val("i8042", NULL, true);
    201         sysinfo_set_item_val("i8042.inr_a", NULL, IRQ_KBD);
    202         sysinfo_set_item_val("i8042.inr_b", NULL, IRQ_MOUSE);
    203         sysinfo_set_item_val("i8042.address.physical", NULL,
    204             (uintptr_t) I8042_BASE);
    205         sysinfo_set_item_val("i8042.address.kernel", NULL,
    206             (uintptr_t) I8042_BASE);
    207 #endif
    208 
    209         sysinfo_set_item_val("netif.ne2000.inr", NULL, IRQ_NE2000);
    210 
     200#endif
     201       
    211202        sysinfo_set_item_val("ia64_iospace", NULL, true);
    212203        sysinfo_set_item_val("ia64_iospace.address", NULL, true);
Note: See TracChangeset for help on using the changeset viewer.