Changeset 4c7257b in mainline for kernel/genarch/src


Ignore:
Timestamp:
2009-02-28T18:55:38Z (16 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
bc18d63
Parents:
c43b1db2
Message:

Do not set sysinfo for uspace drivers directly in the kernel drivers.

Location:
kernel/genarch/src/kbd
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • kernel/genarch/src/kbd/i8042.c

    rc43b1db2 r4c7257b  
    11/*
    2  * Copyright (c) 2001-2004 Jakub Jermar
     2 * Copyright (c) 2009 Jakub Jermar
    33 * All rights reserved.
    44 *
    … …  
    4949#include <console/console.h>
    5050#include <interrupt.h>
    51 #include <sysinfo/sysinfo.h>
    5251
    5352/* Keyboard commands. */
    … …  
    149148                (void) pio_read_8(&dev->data);
    150149       
    151         /*
    152          * This is the necessary evil until the userspace driver is entirely
    153          * self-sufficient.
    154          */
    155         sysinfo_set_item_val("kbd", NULL, true);
    156         sysinfo_set_item_val("kbd.devno", NULL, devno);
    157         sysinfo_set_item_val("kbd.inr", NULL, inr);
    158 #ifdef KBD_LEGACY
    159         sysinfo_set_item_val("kbd.type", NULL, KBD_LEGACY);
    160 #endif
    161 
    162150        return true;
    163151}

  • kernel/genarch/src/kbd/ns16550.c

    rc43b1db2 r4c7257b  
    11/*
    2  * Copyright (c) 2001-2006 Jakub Jermar
     2 * Copyright (c) 2009 Jakub Jermar
    33 * All rights reserved.
    44 *
    … …  
    4848#include <interrupt.h>
    4949#include <arch/interrupt.h>
    50 #include <sysinfo/sysinfo.h>
    5150#include <synch/spinlock.h>
    5251#include <mm/slab.h>
    … …  
    105104                (void) pio_read_8(&dev->rbr);
    106105       
    107         /*
    108          * This is the necessary evil until the userspace driver is entirely
    109          * self-sufficient.
    110          */
    111         sysinfo_set_item_val("kbd", NULL, true);
    112         sysinfo_set_item_val("kbd.type", NULL, KBD_NS16550);
    113         sysinfo_set_item_val("kbd.devno", NULL, devno);
    114         sysinfo_set_item_val("kbd.inr", NULL, inr);
    115         sysinfo_set_item_val("kbd.address.virtual", NULL, (uintptr_t) dev);
    116         sysinfo_set_item_val("kbd.port", NULL, (uintptr_t) dev);
    117        
    118106        /* Enable interrupts */
    119107        pio_write_8(&dev->ier, IER_ERBFI);

  • kernel/genarch/src/kbd/z8530.c

    rc43b1db2 r4c7257b  
    11/*
    2  * Copyright (c) 2001-2004 Jakub Jermar
     2 * Copyright (c) 2009 Jakub Jermar
    33 * All rights reserved.
    44 *
    … …  
    4242#include <console/console.h>
    4343#include <console/chardev.h>
    44 #include <sysinfo/sysinfo.h>
    4544#include <ddi/irq.h>
    4645#include <arch/asm.h>
    … …  
    123122        z8530_write(&dev->ctl_a, WR9, WR9_MIE);
    124123
    125         /*
    126          * This is the necessary evil until the userspace drivers are entirely
    127          * self-sufficient.
    128          */
    129         sysinfo_set_item_val("kbd", NULL, true);
    130         sysinfo_set_item_val("kbd.type", NULL, KBD_Z8530);
    131         sysinfo_set_item_val("kbd.devno", NULL, devno);
    132         sysinfo_set_item_val("kbd.inr", NULL, inr);
    133         sysinfo_set_item_val("kbd.address.virtual", NULL, (uintptr_t) dev);
    134 
    135124        return true;
    136125}
Note: See TracChangeset for help on using the changeset viewer.