Changeset e795203 in mainline


Ignore:
Timestamp:
2009-08-09T15:57:43Z (15 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a4885a42
Parents:
c145bc2
Message:

Move keybuffer code to console as it is not used in keyboard driver.

Location:
uspace/srv
Files:
5 edited
2 moved

Legend:

Unmodified
Added
Removed

  • uspace/srv/console/Makefile

    rc145bc2 re795203  
    3535include $(LIBC_PREFIX)/Makefile.toolchain
    3636
    37 CFLAGS += -I. -I../kbd/include -I../fb
     37CFLAGS += -I. -I../fb
    3838
    3939LIBS = $(LIBC_PREFIX)/libc.a
    … …  
    4747        console.c \
    4848        screenbuffer.c \
    49         ../kbd/generic/keybuffer.c \
     49        keybuffer.c \
    5050        gcons.c
    5151

  • uspace/srv/console/console.c

    rc145bc2 re795203  
    3636#include <fb.h>
    3737#include <ipc/ipc.h>
    38 #include <kbd.h>
     38#include <ipc/kbd.h>
    3939#include <io/keycode.h>
    4040#include <ipc/fb.h>

  • uspace/srv/kbd/Makefile

    rc145bc2 re795203  
    4646        generic/kbd.c \
    4747        genarch/gsp.c \
    48         genarch/stroke.c \
    49         generic/keybuffer.c
     48        genarch/stroke.c
    5049
    5150ARCH_SOURCES =

  • uspace/srv/kbd/generic/kbd.c

    rc145bc2 re795203  
    3838#include <ipc/ipc.h>
    3939#include <ipc/services.h>
     40#include <ipc/kbd.h>
    4041#include <sysinfo.h>
    4142#include <stdio.h>
    … …  
    5152
    5253#include <kbd.h>
    53 #include <keybuffer.h>
    5454#include <kbd_port.h>
    5555#include <kbd_ctl.h>
    … …  
    6060int cons_connected = 0;
    6161int phone2cons = -1;
    62 keybuffer_t keybuffer;
    6362
    6463/** Currently active modifiers. */
    … …  
    242241        layout[active_layout]->reset();
    243242       
    244         /* Initialize key buffer */
    245         keybuffer_init(&keybuffer);
    246        
    247243        async_set_client_connection(console_connection);
    248244

  • uspace/srv/kbd/include/kbd.h

    rc145bc2 re795203  
    3838#define KBD_KBD_H_
    3939
    40 #include <keybuffer.h>
    41 #include <ipc/ipc.h>
    42 
    43 #define KBD_EVENT      1024
    44 #define KBD_MS_LEFT    1025
    45 #define KBD_MS_RIGHT   1026
    46 #define KBD_MS_MIDDLE  1027
    47 #define KBD_MS_MOVE    1028
    48 
    49 typedef enum {
    50         KBD_YIELD = IPC_FIRST_USER_METHOD,
    51         KBD_RECLAIM
    52 } kbd_request_t;
    53 
    5440extern int cir_service;
    5541extern int cir_phone;
Note: See TracChangeset for help on using the changeset viewer.