Changeset 215abc1 in mainline for uspace/srv/kbd/include


Ignore:
Timestamp:
2009-06-03T18:49:33Z (16 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
05b9912
Parents:
bbdbf86
Message:

keyboard server rewrite: rename "kbd events" to more generic "console events" and similar changes
rename key_buffer.* to keybuffer.*
coding style changes

Location:
uspace/srv/kbd/include
Files:
2 edited
1 moved

Legend:

Unmodified
Added
Removed

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

    rbbdbf86 r215abc1  
    2828
    2929/** @addtogroup kbdgen generic
    30  * @brief       HelenOS generic uspace keyboard handler.
    31  * @ingroup  kbd
     30 * @brief HelenOS generic uspace keyboard handler.
     31 * @ingroup kbd
    3232 * @{
    33  */ 
     33 */
    3434/** @file
    3535 */
    … …  
    3838#define KBD_KBD_H_
    3939
    40 #include <key_buffer.h>
     40#include <keybuffer.h>
    4141#include <ipc/ipc.h>
    4242
    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
     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
    4848
    4949typedef enum {
    50         KBD_YIELD       = IPC_FIRST_USER_METHOD,
     50        KBD_YIELD = IPC_FIRST_USER_METHOD,
    5151        KBD_RECLAIM
    5252} kbd_request_t;
    … …  
    6262/**
    6363 * @}
    64  */
    65 
     64 */

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

    rbbdbf86 r215abc1  
    2828
    2929/** @addtogroup kbdgen
    30  * @brief       HelenOS generic uspace keyboard handler.
    31  * @ingroup  kbd
     30 * @brief HelenOS generic uspace keyboard handler.
     31 * @ingroup kbd
    3232 * @{
    33  */ 
     33 */
    3434/** @file
    3535 */
    3636
    37 #ifndef __KEY_BUFFER_H__
    38 #define __KEY_BUFFER_H__
     37#ifndef __KEYBUFFER_H__
     38#define __KEYBUFFER_H__
    3939
    4040#include <sys/types.h>
    41 #include <kbd/kbd.h>
     41#include <io/console.h>
     42#include <bool.h>
    4243
    4344/** Size of buffer for pressed keys */
    44 #define KEYBUFFER_SIZE 128
     45#define KEYBUFFER_SIZE  128
    4546
    4647typedef struct {
    47         kbd_event_t fifo[KEYBUFFER_SIZE];
     48        console_event_t fifo[KEYBUFFER_SIZE];
    4849        unsigned long head;
    4950        unsigned long tail;
    … …  
    5354extern void keybuffer_free(keybuffer_t *);
    5455extern void keybuffer_init(keybuffer_t *);
    55 extern int keybuffer_available(keybuffer_t *);
    56 extern int keybuffer_empty(keybuffer_t *);
    57 extern void keybuffer_push(keybuffer_t *, const kbd_event_t *);
    58 extern int keybuffer_pop(keybuffer_t *, kbd_event_t *);
     56extern size_t keybuffer_available(keybuffer_t *);
     57extern bool keybuffer_empty(keybuffer_t *);
     58extern void keybuffer_push(keybuffer_t *, const console_event_t *);
     59extern bool keybuffer_pop(keybuffer_t *, console_event_t *);
    5960
    6061#endif
    … …  
    6263/**
    6364 * @}
    64  */
    65 
     65 */

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

    rbbdbf86 r215abc1  
    2828
    2929/** @addtogroup kbdgen generic
    30  * @brief       HelenOS generic uspace keyboard handler.
    31  * @ingroup  kbd
     30 * @brief HelenOS generic uspace keyboard handler.
     31 * @ingroup kbd
    3232 * @{
    33  */ 
     33 */
    3434/** @file
    3535 */
    … …  
    3838#define KBD_LAYOUT_H_
    3939
    40 #include <kbd/kbd.h>
    4140#include <sys/types.h>
     41#include <io/console.h>
    4242
    4343typedef struct {
    4444        void (*reset)(void);
    45         wchar_t (*parse_ev)(kbd_event_t *);
     45        wchar_t (*parse_ev)(console_event_t *);
    4646} layout_op_t;
    4747
    … …  
    5454/**
    5555 * @}
    56  */
    57 
     56 */
Note: See TracChangeset for help on using the changeset viewer.