source: mainline/uspace/drv/uhci-rhd/main.c@ e7b7ebd5

lfn serial ticket/834-toolchain-update topic/msim-upgrade topic/simplify-dev-export
Last change on this file since e7b7ebd5 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.1 KB
Line 
1/*
2 * Copyright (c) 2011 Vojtech Horky, 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 <ddf/driver.h>
35#include <usb_iface.h>
36#include <usb/ddfiface.h>
37
38#include <errno.h>
39
40#include <usb/debug.h>
41
42#include "root_hub.h"
43
44#define NAME "uhci-rhd"
45
46static int usb_iface_get_hc_handle(ddf_fun_t *fun, devman_handle_t *handle)
47{
48 assert(fun);
49 assert(fun->driver_data);
50 assert(handle);
51
52 *handle = ((uhci_root_hub_t*)fun->driver_data)->hc_handle;
53
54 return EOK;
55}
56
57static usb_iface_t uhci_rh_usb_iface = {
58 .get_hc_handle = usb_iface_get_hc_handle,
59 .get_address = usb_iface_get_address_hub_impl
60};
61
62static ddf_dev_ops_t uhci_rh_ops = {
63 .interfaces[USB_DEV_IFACE] = &uhci_rh_usb_iface,
64};
65
66static int uhci_rh_add_device(ddf_dev_t *device)
67{
68 if (!device)
69 return ENOTSUP;
70
71 usb_log_debug2("%s called device %d\n", __FUNCTION__, device->handle);
72
73 //device->ops = &uhci_rh_ops;
74 (void) uhci_rh_ops;
75
76 uhci_root_hub_t *rh = malloc(sizeof(uhci_root_hub_t));
77 if (!rh) {
78 usb_log_error("Failed to allocate memory for driver instance.\n");
79 return ENOMEM;
80 }
81
82 /* TODO: get register values from hc */
83 int ret = uhci_root_hub_init(rh, (void*)0xc030, 4, device);
84 if (ret != EOK) {
85 usb_log_error("Failed(%d) to initialize driver instance.\n", ret);
86 free(rh);
87 return ret;
88 }
89
90 device->driver_data = rh;
91 usb_log_info("Sucessfully initialized driver instance for device:%d.\n",
92 device->handle);
93 return EOK;
94}
95
96static driver_ops_t uhci_rh_driver_ops = {
97 .add_device = uhci_rh_add_device,
98};
99
100static driver_t uhci_rh_driver = {
101 .name = NAME,
102 .driver_ops = &uhci_rh_driver_ops
103};
104
105int main(int argc, char *argv[])
106{
107 usb_log_enable(USB_LOG_LEVEL_INFO, NAME);
108 return ddf_driver_main(&uhci_rh_driver);
109}
110/**
111 * @}
112 */
Note: See TracBrowser for help on using the repository browser.