source: mainline/uspace/drv/uhci-hcd/root_hub.c@ 0fc764f

lfn serial ticket/834-toolchain-update topic/msim-upgrade topic/simplify-dev-export
Last change on this file since 0fc764f was eb1a2f4, checked in by Vojtech Horky <vojtechhorky@…>, 14 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: 3.2 KB
Line 
1/*
2 * Copyright (c) 2011 Jan Vesely
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/** @addtogroup usb
29 * @{
30 */
31/** @file
32 * @brief UHCI driver
33 */
34#include <assert.h>
35#include <errno.h>
36#include <stdio.h>
37#include <usb_iface.h>
38#include <usb/debug.h>
39
40#include "root_hub.h"
41#include "uhci.h"
42
43static int usb_iface_get_hc_handle_rh_impl(ddf_fun_t *root_hub_fun,
44 devman_handle_t *handle)
45{
46 ddf_fun_t *hc_fun = root_hub_fun->driver_data;
47 assert(hc_fun != NULL);
48
49 *handle = hc_fun->handle;
50
51 return EOK;
52}
53
54static int usb_iface_get_address_rh_impl(ddf_fun_t *fun, devman_handle_t handle,
55 usb_address_t *address)
56{
57 assert(fun);
58 ddf_fun_t *hc_fun = fun->driver_data;
59 assert(hc_fun);
60 uhci_t *hc = fun_to_uhci(hc_fun);
61 assert(hc);
62
63 usb_address_t addr = usb_address_keeping_find(&hc->address_manager,
64 handle);
65 if (addr < 0) {
66 return addr;
67 }
68
69 if (address != NULL) {
70 *address = addr;
71 }
72
73 return EOK;
74}
75
76usb_iface_t usb_iface_root_hub_fun_impl = {
77 .get_hc_handle = usb_iface_get_hc_handle_rh_impl,
78 .get_address = usb_iface_get_address_rh_impl
79};
80
81static ddf_dev_ops_t root_hub_ops = {
82 .interfaces[USB_DEV_IFACE] = &usb_iface_root_hub_fun_impl
83};
84
85/*----------------------------------------------------------------------------*/
86int setup_root_hub(ddf_fun_t **fun, ddf_dev_t *hc)
87{
88 assert(fun);
89 int ret;
90
91 ddf_fun_t *hub = ddf_fun_create(hc, fun_inner, "root-hub");
92 if (!hub) {
93 usb_log_error("Failed to create root hub device structure.\n");
94 return ENOMEM;
95 }
96
97 char *match_str;
98 ret = asprintf(&match_str, "usb&uhci&root-hub");
99 if (ret < 0) {
100 usb_log_error("Failed to create root hub match string.\n");
101 ddf_fun_destroy(hub);
102 return ENOMEM;
103 }
104
105 ret = ddf_fun_add_match_id(hub, match_str, 100);
106 if (ret != EOK) {
107 usb_log_error("Failed to add root hub match id.\n");
108 ddf_fun_destroy(hub);
109 return ENOMEM;
110 }
111
112 hub->ops = &root_hub_ops;
113
114 *fun = hub;
115 return EOK;
116}
117/**
118 * @}
119 */
Note: See TracBrowser for help on using the repository browser.