Ignore:
Timestamp:
2011-07-20T15:26:21Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
efcebe1
Parents:
25bef0ff (diff), a701812 (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.

File:
1 moved

Legend:

Unmodified
Added
Removed
  • uspace/lib/usbhid/include/usb/hid/iface.h

    r25bef0ff r6a44ee4  
    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 libusbhid
    3230 * @{
    33  */ 
     31 */
    3432/** @file
     33 * Client functions for accessing USB HID interface.
    3534 */
    36 
    37 #ifndef KBD_PORT_H_
    38 #define KBD_PORT_H_
     35#ifndef LIBUSBHID_CLASSES_HID_IFACE_H_
     36#define LIBUSBHID_CLASSES_HID_IFACE_H_
    3937
    4038#include <sys/types.h>
     39#include <async.h>
    4140
    42 extern int kbd_port_init(void);
    43 extern void kbd_port_yield(void);
    44 extern void kbd_port_reclaim(void);
    45 extern void kbd_port_write(uint8_t);
     41extern int usbhid_dev_get_event_length(async_sess_t *, size_t *);
     42extern int usbhid_dev_get_event(async_sess_t *, uint8_t *, size_t, size_t *,
     43    int *, unsigned int);
     44extern int usbhid_dev_get_report_descriptor_length(async_sess_t *, size_t *);
     45extern int usbhid_dev_get_report_descriptor(async_sess_t *, uint8_t *, size_t,
     46    size_t *);
    4647
    4748#endif
    48 
    4949/**
    5050 * @}
    51  */
    52 
     51 */
Note: See TracChangeset for help on using the changeset viewer.