Changeset 88be3a0b in mainline for uspace/drv


Ignore:
Timestamp:
2011-05-17T18:44:43Z (15 years ago)
Author:
Lubos Slovak <lubos.slovak@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
6bfaab5
Parents:
d83bf51 (diff), 2586860 (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:

Small fix in HID driver merged with development

Location:
uspace/drv
Files:
42 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/ohci/root_hub.c

    rd83bf51 r88be3a0b  
    3939
    4040#include "root_hub.h"
    41 #include "usb/classes/classes.h"
    42 #include "usb/devdrv.h"
     41#include <usb/classes/classes.h>
     42#include <usb/dev/driver.h>
    4343#include "ohci_regs.h"
    4444
    45 #include <usb/request.h>
     45#include <usb/dev/request.h>
    4646#include <usb/classes/hub.h>
    4747

  • uspace/drv/ohci/root_hub.h

    rd83bf51 r88be3a0b  
    3636
    3737#include <usb/usb.h>
    38 #include <usb/devdrv.h>
     38#include <usb/dev/driver.h>
    3939
    4040#include "ohci_regs.h"

  • uspace/drv/uhci-rhd/port.c

    rd83bf51 r88be3a0b  
    3737#include <str_error.h>
    3838#include <time.h>
     39#include <async.h>
    3940
    4041#include <usb/usb.h>    /* usb_address_t */
    41 #include <usb/hub.h>    /* usb_hc_new_device_wrapper */
     42#include <usb/dev/hub.h>    /* usb_hc_new_device_wrapper */
    4243#include <usb/debug.h>
    4344

  • uspace/drv/uhci-rhd/port.h

    rd83bf51 r88be3a0b  
    3838#include <fibril.h>
    3939#include <ddf/driver.h>
    40 #include <usb/usbdevice.h> /* usb_hc_connection_t */
     40#include <usb/dev/hc.h> /* usb_hc_connection_t */
    4141
    4242typedef uint16_t port_status_t;

  • uspace/drv/usbflbk/main.c

    rd83bf51 r88be3a0b  
    3434 * Main routines of USB fallback driver.
    3535 */
    36 #include <usb/devdrv.h>
     36#include <usb/dev/driver.h>
    3737#include <usb/debug.h>
    3838#include <errno.h>

  • uspace/drv/usbhid/generic/hiddev.h

    rd83bf51 r88be3a0b  
    3737#define USB_HID_HIDDDEV_H_
    3838
    39 #include <usb/devdrv.h>
     39#include <usb/dev/driver.h>
    4040
    4141struct usb_hid_dev;

  • uspace/drv/usbhid/kbd/kbddev.c

    rd83bf51 r88be3a0b  
    4646
    4747#include <usb/usb.h>
    48 #include <usb/dp.h>
    49 #include <usb/request.h>
    50 #include <usb/classes/hid.h>
    51 #include <usb/pipes.h>
     48#include <usb/dev/dp.h>
     49#include <usb/dev/request.h>
     50#include <usb/hid/hid.h>
     51#include <usb/dev/pipes.h>
    5252#include <usb/debug.h>
    53 #include <usb/classes/hidparser.h>
     53#include <usb/hid/hidparser.h>
    5454#include <usb/classes/classes.h>
    55 #include <usb/classes/hidut.h>
    56 #include <usb/classes/hidreq.h>
    57 #include <usb/classes/hidreport.h>
    58 #include <usb/classes/hid/utled.h>
    59 
    60 #include <usb/devdrv.h>
     55#include <usb/hid/usages/core.h>
     56#include <usb/hid/request.h>
     57#include <usb/hid/hidreport.h>
     58#include <usb/hid/usages/led.h>
     59
     60#include <usb/dev/driver.h>
    6161
    6262#include "kbddev.h"

  • uspace/drv/usbhid/kbd/kbddev.h

    rd83bf51 r88be3a0b  
    4141#include <fibril_synch.h>
    4242
    43 #include <usb/classes/hid.h>
    44 #include <usb/classes/hidparser.h>
     43#include <usb/hid/hid.h>
     44#include <usb/hid/hidparser.h>
    4545#include <ddf/driver.h>
    46 #include <usb/pipes.h>
    47 #include <usb/devdrv.h>
     46#include <usb/dev/pipes.h>
     47#include <usb/dev/driver.h>
    4848
    4949#include "kbdrepeat.h"

  • uspace/drv/usbhid/kbd/main.c

    rd83bf51 r88be3a0b  
    4141#include <str_error.h>
    4242
    43 #include <usb/devdrv.h>
     43#include <usb/dev/driver.h>
    4444
    4545#include "kbddev.h"

  • uspace/drv/usbhid/lgtch-ultrax/lgtch-ultrax.c

    rd83bf51 r88be3a0b  
    4040#include "keymap.h"
    4141
    42 #include <usb/classes/hidparser.h>
     42#include <usb/hid/hidparser.h>
    4343#include <usb/debug.h>
    44 #include <usb/classes/hidut.h>
     44#include <usb/hid/usages/core.h>
    4545
    4646#include <errno.h>

  • uspace/drv/usbhid/lgtch-ultrax/lgtch-ultrax.h

    rd83bf51 r88be3a0b  
    3737#define USB_HID_LGTCH_ULTRAX_H_
    3838
    39 #include <usb/devdrv.h>
     39#include <usb/dev/driver.h>
    4040
    4141struct usb_hid_dev;

  • uspace/drv/usbhid/main.c

    rd83bf51 r88be3a0b  
    4141#include <str_error.h>
    4242
    43 #include <usb/devdrv.h>
    44 #include <usb/devpoll.h>
     43#include <usb/dev/driver.h>
     44#include <usb/dev/poll.h>
    4545
    4646#include "usbhid.h"
    … …  
    202202        printf(NAME ": HelenOS USB HID driver.\n");
    203203
    204         usb_log_enable(USB_LOG_LEVEL_DEBUG, NAME);
     204        usb_log_enable(USB_LOG_LEVEL_DEFAULT, NAME);
    205205
    206206        return usb_driver_main(&usb_hid_driver);

  • uspace/drv/usbhid/mouse/mousedev.c

    rd83bf51 r88be3a0b  
    3737#include <usb/debug.h>
    3838#include <usb/classes/classes.h>
    39 #include <usb/classes/hid.h>
    40 #include <usb/classes/hidreq.h>
    41 #include <usb/classes/hidut.h>
     39#include <usb/hid/hid.h>
     40#include <usb/hid/request.h>
     41#include <usb/hid/usages/core.h>
    4242#include <errno.h>
    4343#include <str_error.h>

  • uspace/drv/usbhid/mouse/mousedev.h

    rd83bf51 r88be3a0b  
    3737#define USB_HID_MOUSEDEV_H_
    3838
    39 #include <usb/devdrv.h>
     39#include <usb/dev/driver.h>
    4040
    4141struct usb_hid_dev;

  • uspace/drv/usbhid/subdrivers.c

    rd83bf51 r88be3a0b  
    3535
    3636#include "subdrivers.h"
    37 #include "usb/classes/hidut.h"
    38 #include "usb/classes/hidpath.h"
     37#include <usb/hid/usages/core.h>
     38#include <usb/hid/hidpath.h>
    3939
    4040#include "lgtch-ultrax/lgtch-ultrax.h"

  • uspace/drv/usbhid/usbhid.c

    rd83bf51 r88be3a0b  
    3737#include <usb/debug.h>
    3838#include <usb/classes/classes.h>
    39 #include <usb/classes/hid.h>
    40 #include <usb/classes/hidparser.h>
    41 #include <usb/classes/hidreport.h>
    42 #include <usb/classes/hidreq.h>
     39#include <usb/hid/hid.h>
     40#include <usb/hid/hidparser.h>
     41#include <usb/hid/hidreport.h>
     42#include <usb/hid/request.h>
    4343#include <errno.h>
    4444#include <str_error.h>

  • uspace/drv/usbhid/usbhid.h

    rd83bf51 r88be3a0b  
    3939#include <stdint.h>
    4040
    41 #include <usb/classes/hidparser.h>
     41#include <usb/hid/hidparser.h>
    4242#include <ddf/driver.h>
    43 #include <usb/pipes.h>
    44 #include <usb/devdrv.h>
    45 #include <usb/classes/hid.h>
     43#include <usb/dev/pipes.h>
     44#include <usb/dev/driver.h>
     45#include <usb/hid/hid.h>
    4646#include <bool.h>
    4747

  • uspace/drv/usbhub/main.c

    rd83bf51 r88be3a0b  
    3636#include <stdio.h>
    3737
    38 #include <usb/devdrv.h>
     38#include <usb/dev/driver.h>
    3939#include <usb/classes/classes.h>
    4040

  • uspace/drv/usbhub/port_status.h

    rd83bf51 r88be3a0b  
    3535#include <bool.h>
    3636#include <sys/types.h>
    37 #include <usb/request.h>
     37#include <usb/dev/request.h>
    3838#include "usbhub_private.h"
    3939

  • uspace/drv/usbhub/ports.h

    rd83bf51 r88be3a0b  
    3636#define DRV_USBHUB_PORTS_H
    3737
    38 #include <usb/devdrv.h>
    39 #include <usb/hub.h>
     38#include <usb/dev/driver.h>
     39#include <usb/dev/hub.h>
    4040
    4141typedef struct usb_hub_info_t usb_hub_info_t;

  • uspace/drv/usbhub/usbhub.c

    rd83bf51 r88be3a0b  
    4242#include <usb/ddfiface.h>
    4343#include <usb/descriptor.h>
    44 #include <usb/recognise.h>
    45 #include <usb/request.h>
     44#include <usb/dev/recognise.h>
     45#include <usb/dev/request.h>
    4646#include <usb/classes/hub.h>
    47 #include <usb/devpoll.h>
     47#include <usb/dev/poll.h>
    4848#include <stdio.h>
    4949
    … …  
    5151#include "usbhub_private.h"
    5252#include "port_status.h"
    53 #include "usb/usb.h"
    54 #include "usb/pipes.h"
    55 #include "usb/classes/classes.h"
     53#include <usb/usb.h>
     54#include <usb/dev/pipes.h>
     55#include <usb/classes/classes.h>
    5656
    5757

  • uspace/drv/usbhub/usbhub.h

    rd83bf51 r88be3a0b  
    3939#include <ddf/driver.h>
    4040
    41 #include <usb/hub.h>
     41#include <usb/dev/hub.h>
    4242#include <usb/classes/hub.h>
    4343
    44 #include <usb/pipes.h>
    45 #include <usb/devdrv.h>
     44#include <usb/dev/pipes.h>
     45#include <usb/dev/driver.h>
    4646
    4747#include <fibril_synch.h>

  • uspace/drv/usbhub/usbhub_private.h

    rd83bf51 r88be3a0b  
    4747#include <usb/usb.h>
    4848#include <usb/debug.h>
    49 #include <usb/request.h>
     49#include <usb/dev/request.h>
    5050
    5151//************

  • uspace/drv/usbkbd/kbddev.c

    rd83bf51 r88be3a0b  
    4646
    4747#include <usb/usb.h>
    48 #include <usb/dp.h>
    49 #include <usb/request.h>
    50 #include <usb/classes/hid.h>
    51 #include <usb/pipes.h>
     48#include <usb/dev/dp.h>
     49#include <usb/dev/request.h>
     50#include <usb/hid/hid.h>
     51#include <usb/dev/pipes.h>
    5252#include <usb/debug.h>
    53 #include <usb/classes/hidparser.h>
     53#include <usb/hid/hidparser.h>
    5454#include <usb/classes/classes.h>
    55 #include <usb/classes/hidut.h>
    56 #include <usb/classes/hidreq.h>
    57 #include <usb/classes/hidreport.h>
    58 #include <usb/classes/hid/utled.h>
    59 
    60 #include <usb/devdrv.h>
     55#include <usb/hid/usages/core.h>
     56#include <usb/hid/request.h>
     57#include <usb/hid/hidreport.h>
     58#include <usb/hid/usages/led.h>
     59
     60#include <usb/dev/driver.h>
    6161
    6262#include "kbddev.h"

  • uspace/drv/usbkbd/kbddev.h

    rd83bf51 r88be3a0b  
    4141#include <fibril_synch.h>
    4242
    43 #include <usb/classes/hid.h>
    44 #include <usb/classes/hidparser.h>
     43#include <usb/hid/hid.h>
     44#include <usb/hid/hidparser.h>
    4545#include <ddf/driver.h>
    46 #include <usb/pipes.h>
    47 #include <usb/devdrv.h>
     46#include <usb/dev/pipes.h>
     47#include <usb/dev/driver.h>
    4848
    4949#include "kbdrepeat.h"

  • uspace/drv/usbkbd/main.c

    rd83bf51 r88be3a0b  
    4141#include <str_error.h>
    4242
    43 #include <usb/devdrv.h>
    44 #include <usb/devpoll.h>
     43#include <usb/dev/driver.h>
     44#include <usb/dev/poll.h>
    4545
    4646#include "kbddev.h"

  • uspace/drv/usbmast/inquiry.c

    rd83bf51 r88be3a0b  
    3434 * Main routines of USB mass storage driver.
    3535 */
    36 #include <usb/devdrv.h>
     36#include <usb/dev/driver.h>
    3737#include <usb/debug.h>
    3838#include <usb/classes/classes.h>

  • uspace/drv/usbmast/main.c

    rd83bf51 r88be3a0b  
    3434 * Main routines of USB mass storage driver.
    3535 */
    36 #include <usb/devdrv.h>
     36#include <usb/dev/driver.h>
    3737#include <usb/debug.h>
    3838#include <usb/classes/classes.h>

  • uspace/drv/usbmast/mast.c

    rd83bf51 r88be3a0b  
    4040#include <str_error.h>
    4141#include <usb/debug.h>
    42 #include <usb/request.h>
     42#include <usb/dev/request.h>
    4343
    4444bool usb_mast_verbose = true;

  • uspace/drv/usbmast/mast.h

    rd83bf51 r88be3a0b  
    3939#include <sys/types.h>
    4040#include <usb/usb.h>
    41 #include <usb/pipes.h>
    42 #include <usb/devdrv.h>
     41#include <usb/dev/pipes.h>
     42#include <usb/dev/driver.h>
    4343
    4444/** Result of SCSI INQUIRY command.

  • uspace/drv/usbmid/dump.c

    rd83bf51 r88be3a0b  
    3737#include <str_error.h>
    3838#include <stdlib.h>
    39 #include <usb/pipes.h>
    40 #include <usb/dp.h>
     39#include <usb/dev/pipes.h>
     40#include <usb/dev/dp.h>
    4141#include <usb/classes/classes.h>
    4242#include "usbmid.h"

  • uspace/drv/usbmid/explore.c

    rd83bf51 r88be3a0b  
    3838#include <stdlib.h>
    3939#include <usb/classes/classes.h>
    40 #include <usb/request.h>
    41 #include <usb/dp.h>
     40#include <usb/dev/request.h>
     41#include <usb/dev/dp.h>
    4242#include <usb/ddfiface.h>
    4343#include "usbmid.h"

  • uspace/drv/usbmid/main.c

    rd83bf51 r88be3a0b  
    3838#include <usb/debug.h>
    3939#include <usb/classes/classes.h>
    40 #include <usb/request.h>
     40#include <usb/dev/request.h>
    4141#include <usb/descriptor.h>
    42 #include <usb/pipes.h>
     42#include <usb/dev/pipes.h>
    4343
    4444#include "usbmid.h"

  • uspace/drv/usbmid/usbmid.c

    rd83bf51 r88be3a0b  
    3939#include <usb_iface.h>
    4040#include <usb/ddfiface.h>
    41 #include <usb/pipes.h>
     41#include <usb/dev/pipes.h>
    4242#include <usb/classes/classes.h>
    43 #include <usb/recognise.h>
     43#include <usb/dev/recognise.h>
    4444#include "usbmid.h"
    4545

  • uspace/drv/usbmid/usbmid.h

    rd83bf51 r88be3a0b  
    4040#include <ddf/driver.h>
    4141#include <usb/usb.h>
    42 #include <usb/pipes.h>
     42#include <usb/dev/pipes.h>
    4343#include <usb/debug.h>
    44 #include <usb/devdrv.h>
     44#include <usb/dev/driver.h>
    4545
    4646#define NAME "usbmid"

  • uspace/drv/usbmouse/init.c

    rd83bf51 r88be3a0b  
    3737#include <usb/debug.h>
    3838#include <usb/classes/classes.h>
    39 #include <usb/classes/hid.h>
    40 #include <usb/request.h>
     39#include <usb/hid/hid.h>
     40#include <usb/dev/request.h>
    4141#include <errno.h>
    4242

  • uspace/drv/usbmouse/main.c

    rd83bf51 r88be3a0b  
    3636#include "mouse.h"
    3737#include <usb/debug.h>
    38 #include <usb/devpoll.h>
     38#include <usb/dev/poll.h>
    3939#include <errno.h>
    4040#include <str_error.h>

  • uspace/drv/usbmouse/mouse.h

    rd83bf51 r88be3a0b  
    3737#define USBMOUSE_MOUSE_H_
    3838
    39 #include <usb/devdrv.h>
    40 #include <usb/pipes.h>
     39#include <usb/dev/driver.h>
     40#include <usb/dev/pipes.h>
    4141#include <time.h>
    4242

  • uspace/drv/vhc/conndev.c

    rd83bf51 r88be3a0b  
    3737#include <errno.h>
    3838#include <ddf/driver.h>
     39#include <usbvirt/ipc.h>
    3940#include "conn.h"
    4041
    4142static fibril_local uintptr_t plugged_device_handle = 0;
     43#define PLUGGED_DEVICE_NAME_MAXLEN 256
     44static fibril_local char plugged_device_name[PLUGGED_DEVICE_NAME_MAXLEN + 1] = "<unknown>";
     45
     46/** Receive device name.
     47 *
     48 * @warning Errors are silently ignored.
     49 *
     50 * @param phone Phone to the virtual device.
     51 */
     52static void receive_device_name(int phone)
     53{
     54        aid_t opening_request = async_send_0(phone, IPC_M_USBVIRT_GET_NAME, NULL);
     55        if (opening_request == 0) {
     56                return;
     57        }
     58
     59
     60        ipc_call_t data_request_call;
     61        aid_t data_request = async_data_read(phone,
     62             plugged_device_name, PLUGGED_DEVICE_NAME_MAXLEN,
     63             &data_request_call);
     64
     65        if (data_request == 0) {
     66                async_wait_for(opening_request, NULL);
     67                return;
     68        }
     69
     70        sysarg_t data_request_rc;
     71        sysarg_t opening_request_rc;
     72        async_wait_for(data_request, &data_request_rc);
     73        async_wait_for(opening_request, &opening_request_rc);
     74
     75        if ((data_request_rc != EOK) || (opening_request_rc != EOK)) {
     76                return;
     77        }
     78
     79        size_t len = IPC_GET_ARG2(data_request_call);
     80        plugged_device_name[len] = 0;
     81}
    4282
    4383/** Default handler for IPC methods not handled by DDF.
    … …  
    65105                async_answer_0(icallid, EOK);
    66106
    67                 usb_log_info("New virtual device `%s' (id = %" PRIxn ").\n",
    68                     rc == EOK ? "XXX" : "<unknown>", plugged_device_handle);
     107                receive_device_name(callback);
     108
     109                usb_log_info("New virtual device `%s' (id: %" PRIxn ").\n",
     110                    plugged_device_name, plugged_device_handle);
    69111
    70112                return;
    … …  
    85127
    86128        if (plugged_device_handle != 0) {
    87                 usb_log_info("Virtual device disconnected (id = %" PRIxn ").\n",
    88                     plugged_device_handle);
     129                usb_log_info("Virtual device `%s' disconnected (id: %" PRIxn ").\n",
     130                    plugged_device_name, plugged_device_handle);
    89131                vhc_virtdev_unplug(vhc, plugged_device_handle);
    90132        }

  • uspace/drv/vhc/connhost.c

    rd83bf51 r88be3a0b  
    3636#include <errno.h>
    3737#include <usb/usb.h>
    38 #include <usb/addrkeep.h>
    3938#include <usb/ddfiface.h>
    4039#include <usb/debug.h>

  • uspace/drv/vhc/hub.c

    rd83bf51 r88be3a0b  
    4040#include <ddf/driver.h>
    4141#include <devman.h>
    42 #include <usb/hub.h>
    43 #include <usb/recognise.h>
     42#include <usb/dev/hub.h>
     43#include <usb/dev/recognise.h>
    4444
    4545#include "hub.h"

  • uspace/drv/vhc/transfer.c

    rd83bf51 r88be3a0b  
    44#include <usbvirt/ipc.h>
    55#include "vhcd.h"
    6 
    7 #define list_foreach(pos, head) \
    8         for (pos = (head)->next; pos != (head); \
    9                 pos = pos->next)
    106
    117vhc_transfer_t *vhc_transfer_create(usb_address_t address, usb_endpoint_t ep,
    … …  
    6763        fibril_mutex_lock(&vhc->guard);
    6864
    69         link_t *pos;
    7065        bool target_found = false;
    71         list_foreach(pos, &vhc->devices) {
     66        list_foreach(vhc->devices, pos) {
    7267                vhc_virtdev_t *dev = list_get_instance(pos, vhc_virtdev_t, link);
    7368                fibril_mutex_lock(&dev->guard);
    … …  
    161156}
    162157
     158static vhc_transfer_t *dequeue_first_transfer(vhc_virtdev_t *dev)
     159{
     160        assert(fibril_mutex_is_locked(&dev->guard));
     161        assert(!list_empty(&dev->transfer_queue));
     162
     163        vhc_transfer_t *transfer = list_get_instance(dev->transfer_queue.next,
     164            vhc_transfer_t, link);
     165        list_remove(&transfer->link);
     166
     167        return transfer;
     168}
     169
     170
     171static void execute_transfer_callback_and_free(vhc_transfer_t *transfer,
     172    size_t data_transfer_size, int outcome)
     173{
     174        assert(outcome != ENAK);
     175
     176        usb_log_debug2("Transfer %p ended: %s.\n",
     177            transfer, str_error(outcome));
     178
     179        if (transfer->direction == USB_DIRECTION_IN) {
     180                transfer->callback_in(transfer->ddf_fun, outcome,
     181                    data_transfer_size, transfer->callback_arg);
     182        } else {
     183                assert(transfer->direction == USB_DIRECTION_OUT);
     184                transfer->callback_out(transfer->ddf_fun, outcome,
     185                    transfer->callback_arg);
     186        }
     187
     188        free(transfer);
     189}
    163190
    164191int vhc_transfer_queue_processor(void *arg)
    … …  
    174201                }
    175202
    176                 vhc_transfer_t *transfer = list_get_instance(dev->transfer_queue.next,
    177                     vhc_transfer_t, link);
    178                 list_remove(&transfer->link);
     203                vhc_transfer_t *transfer = dequeue_first_transfer(dev);
    179204                fibril_mutex_unlock(&dev->guard);
    180205
    … …  
    214239
    215240                if (rc != ENAK) {
    216                         usb_log_debug2("Transfer %p ended: %s.\n",
    217                             transfer, str_error(rc));
    218                         if (transfer->direction == USB_DIRECTION_IN) {
    219                                 transfer->callback_in(transfer->ddf_fun, rc,
    220                                     data_transfer_size, transfer->callback_arg);
    221                         } else {
    222                                 assert(transfer->direction == USB_DIRECTION_OUT);
    223                                 transfer->callback_out(transfer->ddf_fun, rc,
    224                                     transfer->callback_arg);
    225                         }
    226                         free(transfer);
     241                        execute_transfer_callback_and_free(transfer,
     242                            data_transfer_size, rc);
    227243                }
    228244
    … …  
    231247        }
    232248
     249        /* Immediately fail all remaining transfers. */
     250        while (!list_empty(&dev->transfer_queue)) {
     251                vhc_transfer_t *transfer = dequeue_first_transfer(dev);
     252                execute_transfer_callback_and_free(transfer, 0, EBADCHECKSUM);
     253        }
     254
    233255        fibril_mutex_unlock(&dev->guard);
    234256
    235         // TODO - destroy pending transfers
    236 
    237257        return EOK;
    238258}
Note: See TracChangeset for help on using the changeset viewer.