source: mainline/uspace/drv/usbhid/hid.h@ 1ae51ae

lfn serial ticket/834-toolchain-update topic/msim-upgrade topic/simplify-dev-export
Last change on this file since 1ae51ae was eb1a2f4, checked in by Vojtech Horky <vojtechhorky@…>, 15 years ago

Merge mainline changes (DDF refactoring)

This merge includes DDF refactoring that brought multifunctional devices
(i.e. ddf_dev_t and ddf_fun_t). Please, see ticket #295 at HelenOS
upstream Trac.

The conflicts themselves were easy to solve (merely several renamings).

Changes to USB subsystem:

  • drivers uses ddf_dev_t and ddf_fun_t
  • different signatures of many library functions
  • several hacks around communication with parent device (now the communication is clearer and somehow what we have now is hack about other hacks)
    • will repair and clean later
  • maybe added some extra debugging messages (the diff has about 240K, and I admit I have no energy to double check that)

WARNING:

  • the diff is VERY long, recommended is viewing partial diffs of the merge (i.e. merges in mainline branch that lead to the parent one)
  • merging with your branches might involve huge renamings, sorry, no other way is possible

BUGS:

  • hub driver will not work (no function created)

GOOD NEWS:

  • QEMU keyboard seems to work with QEMU 0.13 and 0.14
  • we are up-to-date with mainline again
  • Property mode set to 100644
File size: 2.4 KB
Line 
1/*
2 * Copyright (c) 2011 Lubos Slovak
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 *
9 * - Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer.
11 * - Redistributions in binary form must reproduce the above copyright
12 * notice, this list of conditions and the following disclaimer in the
13 * documentation and/or other materials provided with the distribution.
14 * - The name of the author may not be used to endorse or promote products
15 * derived from this software without specific prior written permission.
16 *
17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
18 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
19 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
20 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
21 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
22 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
23 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 */
28
29/** @addtogroup drvusbhid
30 * @{
31 */
32/** @file
33 * Common definitions.
34 */
35
36#ifndef USBHID_HID_H_
37#define USBHID_HID_H_
38
39#include <usb/classes/hid.h>
40#include <ddf/driver.h>
41#include <usb/pipes.h>
42
43/**
44 *
45 */
46typedef struct {
47 usb_standard_interface_descriptor_t iface_desc;
48 usb_standard_endpoint_descriptor_t *endpoints;
49 usb_standard_hid_descriptor_t hid_desc;
50 uint8_t *report_desc;
51 //usb_standard_hid_class_descriptor_info_t *class_desc_info;
52 //uint8_t **class_descs;
53} usb_hid_iface_t;
54
55/**
56 *
57 */
58typedef struct {
59 usb_standard_configuration_descriptor_t config_descriptor;
60 usb_hid_iface_t *interfaces;
61} usb_hid_configuration_t;
62
63/**
64 * @brief USB/HID keyboard device type.
65 *
66 * Quite dummy right now.
67 */
68typedef struct {
69 ddf_dev_t *device;
70 usb_hid_configuration_t *conf;
71 usb_hid_report_parser_t *parser;
72
73 usb_device_connection_t wire;
74 usb_endpoint_pipe_t ctrl_pipe;
75 usb_endpoint_pipe_t poll_pipe;
76} usb_hid_dev_kbd_t;
77
78// TODO: more configurations!
79
80#endif
Note: See TracBrowser for help on using the repository browser.