Changeset b0f00a9 in mainline for uspace/lib/usbdev/src


Ignore:
Timestamp:
2011-11-06T22:21:05Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
898e847
Parents:
2bdf8313 (diff), 7b5f4c9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes.

Location:
uspace/lib/usbdev/src
Files:
11 added
1 moved

Legend:

Unmodified
Added
Removed
  • uspace/lib/usbdev/src/pipepriv.h

    r2bdf8313 rb0f00a9  
    11/*
    2  * Copyright (c) 2009 Jiri Svoboda
     2 * Copyright (c) 2011 Vojtech Horky
    33 * All rights reserved.
    44 *
     
    2727 */
    2828
    29 /** @addtogroup kbdgen generic
    30  * @brief HelenOS generic uspace keyboard handler.
    31  * @ingroup kbd
     29/** @addtogroup libusbdev
    3230 * @{
    3331 */
    3432/** @file
     33 * Library internal functions on USB pipes.
    3534 */
     35#ifndef LIBUSBDEV_PIPEPRIV_H_
     36#define LIBUSBDEV_PIPEPRIV_H_
    3637
    37 #ifndef KBD_LAYOUT_H_
    38 #define KBD_LAYOUT_H_
     38#include <usb/dev/pipes.h>
     39#include <bool.h>
    3940
    40 #include <sys/types.h>
    41 #include <io/console.h>
     41void pipe_acquire(usb_pipe_t *);
     42void pipe_release(usb_pipe_t *);
    4243
    43 typedef struct {
    44         void (*reset)(void);
    45         wchar_t (*parse_ev)(console_event_t *);
    46 } layout_op_t;
     44void pipe_start_transaction(usb_pipe_t *);
     45void pipe_end_transaction(usb_pipe_t *);
    4746
    48 extern layout_op_t us_qwerty_op;
    49 extern layout_op_t us_dvorak_op;
    50 extern layout_op_t cz_op;
     47int pipe_add_ref(usb_pipe_t *, bool);
     48void pipe_drop_ref(usb_pipe_t *);
     49
    5150
    5251#endif
    53 
    5452/**
    5553 * @}
Note: See TracChangeset for help on using the changeset viewer.