Changeset c2417bc in mainline for kernel/genarch/include


Ignore:
Timestamp:
2009-04-21T12:46:26Z (16 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
f2d2c7ba
Parents:
44b7783
Message:

change the way how input devices are wired together according to ticket #44
(also the proposal http://lists.modry.cz/cgi-bin/private/helenos-devel/2009-March/002507.html)

Location:
kernel/genarch/include
Files:
6 edited
1 moved

Legend:

Unmodified
Added
Removed
  • kernel/genarch/include/drivers/dsrln/dsrlnin.h

    r44b7783 rc2417bc  
    5050        irq_t irq;
    5151        dsrlnin_t *dsrlnin;
    52         indev_t kbrdin;
     52        indev_t *srlnin;
    5353} dsrlnin_instance_t;
    5454
    55 extern indev_t *dsrlnin_init(dsrlnin_t *, inr_t);
     55extern dsrlnin_instance_t *dsrlnin_init(dsrlnin_t *, inr_t);
     56extern void dsrlnin_wire(dsrlnin_instance_t *, indev_t *);
    5657
    5758#endif
  • kernel/genarch/include/drivers/i8042/i8042.h

    r44b7783 rc2417bc  
    5050        irq_t irq;
    5151        i8042_t *i8042;
    52         indev_t kbrdin;
     52        indev_t *kbrdin;
    5353} i8042_instance_t;
    5454
    55 extern indev_t *i8042_init(i8042_t *, inr_t);
     55extern i8042_instance_t *i8042_init(i8042_t *, inr_t);
     56extern void i8042_wire(i8042_instance_t *, indev_t *);
    5657extern void i8042_cpu_reset(i8042_t *);
    5758
  • kernel/genarch/include/drivers/ns16550/ns16550.h

    r44b7783 rc2417bc  
    6363/** Structure representing the ns16550 device. */
    6464typedef struct {
     65        irq_t irq;
    6566        ns16550_t *ns16550;
    66         irq_t irq;
    67         indev_t kbrdin;
     67        indev_t *kbrdin;
    6868} ns16550_instance_t;
    6969
    70 extern indev_t *ns16550_init(ns16550_t *, inr_t, cir_t, void *);
     70extern ns16550_instance_t *ns16550_init(ns16550_t *, inr_t, cir_t, void *);
     71extern void ns16550_wire(ns16550_instance_t *, indev_t *);
    7172
    7273#endif
  • kernel/genarch/include/drivers/via-cuda/cuda.h

    r44b7783 rc2417bc  
    2727 */
    2828
    29 /** @addtogroup ppc32   
     29/** @addtogroup genarch
    3030 * @{
    3131 */
     
    3333 */
    3434
    35 #ifndef KERN_ppc32_CUDA_H_
    36 #define KERN_ppc32_CUDA_H_
     35#ifndef KERN_CUDA_H_
     36#define KERN_CUDA_H_
    3737
     38#include <ddi/irq.h>
    3839#include <arch/types.h>
    39 #include <typedefs.h>
     40#include <console/chardev.h>
    4041
    41 extern void cuda_init(uintptr_t base, size_t size);
    42 extern int cuda_get_scancode(void);
     42typedef struct {
     43} cuda_t;
     44
     45typedef struct {
     46        irq_t irq;
     47        cuda_t *cuda;
     48        indev_t *kbrdin;
     49} cuda_instance_t;
     50
     51extern cuda_instance_t *cuda_init(cuda_t *, inr_t, cir_t, void *);
     52extern void cuda_wire(cuda_instance_t *, indev_t *);
    4353
    4454#endif
  • kernel/genarch/include/drivers/z8530/z8530.h

    r44b7783 rc2417bc  
    117117        irq_t irq;
    118118        z8530_t *z8530;
    119         indev_t kbrdin;
     119        indev_t *kbrdin;
    120120} z8530_instance_t;
    121121
    122 extern indev_t *z8530_init(z8530_t *, inr_t, cir_t, void *);
     122extern z8530_instance_t *z8530_init(z8530_t *, inr_t, cir_t, void *);
     123extern void z8530_wire(z8530_instance_t *, indev_t *);
    123124
    124125#endif
  • kernel/genarch/include/kbrd/kbrd.h

    r44b7783 rc2417bc  
    3838
    3939#include <console/chardev.h>
     40#include <proc/thread.h>
     41#include <synch/spinlock.h>
    4042
    41 extern void kbrd_init(indev_t *devin);
     43typedef struct {
     44        thread_t *thread;
     45       
     46        indev_t *sink;
     47        indev_t raw;
     48       
     49        SPINLOCK_DECLARE(keylock);        /**< keylock protects keyflags and lockflags. */
     50        volatile unsigned int keyflags;   /**< Tracking of multiple keypresses. */
     51        volatile unsigned int lockflags;  /**< Tracking of multiple keys lockings. */
     52} kbrd_instance_t;
     53
     54extern kbrd_instance_t *kbrd_init(void);
     55extern indev_t *kbrd_wire(kbrd_instance_t *, indev_t *);
    4256
    4357#endif
  • kernel/genarch/include/srln/srln.h

    r44b7783 rc2417bc  
    3838
    3939#include <console/chardev.h>
     40#include <proc/thread.h>
    4041
    41 extern void srln_init(indev_t *devin);
     42typedef struct {
     43        thread_t *thread;
     44       
     45        indev_t *sink;
     46        indev_t raw;
     47} srln_instance_t;
     48
     49extern srln_instance_t *srln_init(void);
     50extern indev_t *srln_wire(srln_instance_t *, indev_t *);
    4251
    4352#endif
Note: See TracChangeset for help on using the changeset viewer.