Changes in / [67b6fc5:e0df6c2] in mainline


Ignore:
Location:
uspace
Files:
2 deleted
12 edited

Legend:

Unmodified
Added
Removed

  • uspace/app/usbinfo/info.c

    r67b6fc5 re0df6c2  
    3939#include <usb/usbdrv.h>
    4040#include <usb/pipes.h>
    41 #include <usb/recognise.h>
    4241#include <usb/request.h>
    4342#include "usbinfo.h"
    … …  
    4847        usb_device_connection_t wire;
    4948        usb_endpoint_pipe_t ctrl_pipe;
     49        ctrl_pipe.hc_phone = -1;
     50
     51        int hc_phone = devman_device_connect(hc_handle, 0);
     52        if (hc_phone < 0) {
     53                fprintf(stderr,
     54                    NAME ": failed to connect to host controller (%zu): %s.\n",
     55                        (size_t) hc_handle, str_error(hc_phone));
     56                return hc_phone;
     57        }
     58
     59        /*
     60         * Dump information about possible match ids.
     61         */
     62        match_id_list_t match_id_list;
     63        init_match_ids(&match_id_list);
     64        rc = usb_drv_create_device_match_ids(hc_phone, &match_id_list, address);
     65        if (rc != EOK) {
     66                fprintf(stderr,
     67                    NAME ": failed to fetch match ids of the device: %s.\n",
     68                    str_error(rc));
     69                goto leave;
     70        }
     71        dump_match_ids(&match_id_list);
    5072
    5173        /*
    … …  
    7395                goto leave;
    7496        }
    75 
    76         /*
    77          * Dump information about possible match ids.
    78          */
    79         match_id_list_t match_id_list;
    80         init_match_ids(&match_id_list);
    81         rc = usb_device_create_match_ids(&ctrl_pipe, &match_id_list);
    82         if (rc != EOK) {
    83                 fprintf(stderr,
    84                     NAME ": failed to fetch match ids of the device: %s.\n",
    85                     str_error(rc));
    86                 goto leave;
    87         }
    88         dump_match_ids(&match_id_list);
    8997
    9098        /*
    … …  
    133141leave:
    134142        /* Ignoring errors here. */
     143        async_hangup(hc_phone);
    135144        usb_endpoint_pipe_end_session(&ctrl_pipe);
    136145

  • uspace/drv/uhci-hcd/uhci.h

    r67b6fc5 re0df6c2  
    7272
    7373#define UHCI_FRAME_LIST_COUNT 1024
    74 #define UHCI_CLEANER_TIMEOUT 10000
     74#define UHCI_CLEANER_TIMEOUT 1000000
    7575#define UHCI_DEBUGER_TIMEOUT 5000000
    7676

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

    r67b6fc5 re0df6c2  
    3333 */
    3434#include <errno.h>
    35 #include <str_error.h>
    3635
    3736#include <usb/usb.h>    /* usb_address_t */
    3837#include <usb/usbdrv.h> /* usb_drv_*     */
    3938#include <usb/debug.h>
    40 #include <usb/recognise.h>
    4139
    4240#include "port.h"
    … …  
    206204        assert(port->attached_device == 0);
    207205
    208         devman_handle_t hc_handle;
    209         ret = usb_drv_find_hc(port->rh, &hc_handle);
    210         if (ret != EOK) {
    211                 usb_log_error("Failed to get handle of host controller: %s.\n",
    212                     str_error(ret));
    213                 uhci_port_set_enabled(port, false);
    214                 return ENOMEM;
    215         }
    216 
    217         ret = usb_device_register_child_in_devman(usb_address, hc_handle,
    218             port->rh, &port->attached_device);
     206        ret = usb_drv_register_child_in_devman(port->hc_phone, port->rh,
     207          usb_address, &port->attached_device);
     208
    219209        if (ret != EOK) { /* something went wrong */
    220210                usb_log_error("Failed(%d) in usb_drv_register_child.\n", ret);

  • uspace/drv/usbhid/main.c

    r67b6fc5 re0df6c2  
    4545#include <str_error.h>
    4646#include <fibril.h>
    47 #include <usb/debug.h>
    48 #include <usb/classes/classes.h>
    4947#include <usb/classes/hid.h>
    5048#include <usb/classes/hidparser.h>
    … …  
    6361#define GUESSED_POLL_ENDPOINT 1
    6462
    65 /** Keyboard polling endpoint description for boot protocol class. */
    66 static usb_endpoint_description_t poll_endpoint_description = {
    67         .transfer_type = USB_TRANSFER_INTERRUPT,
    68         .direction = USB_DIRECTION_IN,
    69         .interface_class = USB_CLASS_HID,
    70         .interface_subclass = USB_HID_SUBCLASS_BOOT,
    71         .interface_protocol = USB_HID_PROTOCOL_KEYBOARD,
    72         .flags = 0
    73 };
    74 
    7563static void default_connection_handler(device_t *, ipc_callid_t, ipc_call_t *);
    7664static device_ops_t keyboard_ops = {
    … …  
    342330        }
    343331       
    344         /*
    345          * Initialize the interrupt in endpoint.
    346          */
    347         usb_endpoint_mapping_t endpoint_mapping[1] = {
    348                 {
    349                         .pipe = &kbd_dev->poll_pipe,
    350                         .description = &poll_endpoint_description
    351                 }
    352         };
    353         rc = usb_endpoint_pipe_initialize_from_configuration(
    354             endpoint_mapping, 1,
    355             descriptors, config_desc.total_length,
    356             &kbd_dev->wire);
    357         if (rc != EOK) {
    358                 usb_log_error("Failed to initialize poll pipe: %s.\n",
    359                     str_error(rc));
    360                 return rc;
    361         }
    362         if (!endpoint_mapping[0].present) {
    363                 usb_log_warning("Not accepting device, " \
    364                     "not boot-protocol keyboard.\n");
    365                 return EREFUSED;
    366         }
    367 
    368 
    369 
    370 
    371332        kbd_dev->conf = (usb_hid_configuration_t *)calloc(1,
    372333            sizeof(usb_hid_configuration_t));
    … …  
    376337        }
    377338       
    378         /*rc = usbkbd_parse_descriptors(descriptors, transferred, kbd_dev->conf);
     339        rc = usbkbd_parse_descriptors(descriptors, transferred, kbd_dev->conf);
    379340        free(descriptors);
    380341        if (rc != EOK) {
    … …  
    383344        }
    384345
    385         // get and report descriptors*/
     346        // get and report descriptors
    386347        rc = usbkbd_get_report_descriptor(kbd_dev);
    387348        if (rc != EOK) {
    … …  
    400361     *    as the endpoint for polling
    401362         */
    402 
     363       
    403364        return EOK;
    404365}
    … …  
    435396        if (rc != EOK) {
    436397                printf("Failed to initialize default control pipe: %s.\n",
     398                    str_error(rc));
     399                goto error_leave;
     400        }
     401
     402        rc = usb_endpoint_pipe_initialize(&kbd_dev->poll_pipe, &kbd_dev->wire,
     403            GUESSED_POLL_ENDPOINT, USB_TRANSFER_INTERRUPT, USB_DIRECTION_IN);
     404        if (rc != EOK) {
     405                printf("Failed to initialize interrupt in pipe: %s.\n",
    437406                    str_error(rc));
    438407                goto error_leave;
    … …  
    449418        usb_endpoint_pipe_start_session(&kbd_dev->ctrl_pipe);
    450419        //usb_request_set_configuration(&kbd_dev->ctrl_pipe, 1);
    451         rc = usbkbd_process_descriptors(kbd_dev);
     420        usbkbd_process_descriptors(kbd_dev);
    452421        usb_endpoint_pipe_end_session(&kbd_dev->ctrl_pipe);
    453         if (rc != EOK) {
    454                 goto error_leave;
    455         }
    456422
    457423        return kbd_dev;
    … …  
    611577int main(int argc, char *argv[])
    612578{
    613         usb_log_enable(USB_LOG_LEVEL_INFO, "usbhid");
    614579        return driver_main(&kbd_driver);
    615580}

  • uspace/drv/usbhub/usbhub.c

    r67b6fc5 re0df6c2  
    3636#include <bool.h>
    3737#include <errno.h>
    38 #include <str_error.h>
    3938
    4039#include <usb_iface.h>
    4140#include <usb/usbdrv.h>
    4241#include <usb/descriptor.h>
    43 #include <usb/recognise.h>
    4442#include <usb/devreq.h>
    4543#include <usb/classes/hub.h>
    … …  
    319317        }
    320318
    321         devman_handle_t hc_handle;
    322         opResult = usb_drv_find_hc(hub->device, &hc_handle);
    323         if (opResult != EOK) {
    324                 usb_log_error("Failed to get handle of host controller: %s.\n",
    325                     str_error(opResult));
    326                 return;
    327         }
    328 
    329319        devman_handle_t child_handle;
    330         opResult = usb_device_register_child_in_devman(new_device_address,
    331             hc_handle, hub->device, &child_handle);
     320        opResult = usb_drv_register_child_in_devman(hc, hub->device,
     321            new_device_address, &child_handle);
    332322        if (opResult != EOK) {
    333323                dprintf(USB_LOG_LEVEL_ERROR, "could not start driver for new device");

  • uspace/drv/vhc/hub.c

    r67b6fc5 re0df6c2  
    4141#include <driver.h>
    4242#include <usb/usbdrv.h>
    43 #include <usb/recognise.h>
    4443
    4544#include "hub.h"
    … …  
    9493
    9594        devman_handle_t hub_handle;
    96         usb_device_register_child_in_devman(hub_address, hc_dev->handle,
    97             hc_dev, &hub_handle);
    98         //usb_drv_register_child_in_devman(hc, hc_dev, hub_address, &hub_handle);
     95        usb_drv_register_child_in_devman(hc, hc_dev, hub_address, &hub_handle);
    9996        usb_drv_bind_address(hc, hub_address, hub_handle);
    10097

  • uspace/lib/usb/Makefile

    r67b6fc5 re0df6c2  
    4444        src/localdrv.c \
    4545        src/pipes.c \
    46         src/pipesinit.c \
    4746        src/recognise.c \
    4847        src/remotedrv.c \

  • uspace/lib/usb/include/usb/classes/hid.h

    r67b6fc5 re0df6c2  
    5050        USB_HIDREQ_SET_PROTOCOL = 11
    5151} usb_hid_request_t;
    52 
    53 /** USB/HID subclass constants. */
    54 typedef enum {
    55         USB_HID_SUBCLASS_NONE = 0,
    56         USB_HID_SUBCLASS_BOOT = 1
    57 } usb_hid_subclass_t;
    5852
    5953/** USB/HID interface protocols. */

  • uspace/lib/usb/include/usb/pipes.h

    r67b6fc5 re0df6c2  
    3838#include <sys/types.h>
    3939#include <usb/usb.h>
    40 #include <usb/descriptor.h>
    4140#include <ipc/devman.h>
    4241#include <driver.h>
    … …  
    7473        usb_direction_t direction;
    7574
    76         /** Maximum packet size for the endpoint. */
    77         size_t max_packet_size;
    78 
    7975        /** Phone to the host controller.
    8076         * Negative when no session is active.
    … …  
    8379} usb_endpoint_pipe_t;
    8480
    85 
    86 /** Description of endpoint characteristics. */
    87 typedef struct {
    88         /** Transfer type (e.g. control or interrupt). */
    89         usb_transfer_type_t transfer_type;
    90         /** Transfer direction (to or from a device). */
    91         usb_direction_t direction;
    92         /** Interface class this endpoint belongs to (-1 for any). */
    93         int interface_class;
    94         /** Interface subclass this endpoint belongs to (-1 for any). */
    95         int interface_subclass;
    96         /** Interface protocol this endpoint belongs to (-1 for any). */
    97         int interface_protocol;
    98         /** Extra endpoint flags. */
    99         unsigned int flags;
    100 } usb_endpoint_description_t;
    101 
    102 /** Mapping of endpoint pipes and endpoint descriptions. */
    103 typedef struct {
    104         /** Endpoint pipe. */
    105         usb_endpoint_pipe_t *pipe;
    106         /** Endpoint description. */
    107         const usb_endpoint_description_t *description;
    108         /** Found descriptor fitting the description. */
    109         usb_standard_endpoint_descriptor_t *descriptor;
    110         /** Interface the endpoint belongs to. */
    111         usb_standard_interface_descriptor_t *interface;
    112         /** Whether the endpoint was actually found. */
    113         bool present;
    114 } usb_endpoint_mapping_t;
    11581
    11682int usb_device_connection_initialize_from_device(usb_device_connection_t *,
    … …  
    12187int usb_endpoint_pipe_initialize(usb_endpoint_pipe_t *,
    12288    usb_device_connection_t *,
    123     usb_endpoint_t, usb_transfer_type_t, size_t, usb_direction_t);
     89    usb_endpoint_t, usb_transfer_type_t, usb_direction_t);
    12490int usb_endpoint_pipe_initialize_default_control(usb_endpoint_pipe_t *,
    12591    usb_device_connection_t *);
    126 int usb_endpoint_pipe_initialize_from_configuration(usb_endpoint_mapping_t *,
    127     size_t, uint8_t *, size_t, usb_device_connection_t *);
    12892
    12993

  • uspace/lib/usb/include/usb/usbdrv.h

    r67b6fc5 re0df6c2  
    106106    const void *, size_t);
    107107
     108int usb_drv_create_device_match_ids(int, match_id_list_t *, usb_address_t);
     109int usb_drv_register_child_in_devman(int, device_t *, usb_address_t,
     110    devman_handle_t *);
     111
    108112
    109113#endif

  • uspace/lib/usb/src/pipes.c

    r67b6fc5 re0df6c2  
    123123 * @param endpoint_no Endpoint number (in USB 1.1 in range 0 to 15).
    124124 * @param transfer_type Transfer type (e.g. interrupt or bulk).
    125  * @param max_packet_size Maximum packet size in bytes.
    126125 * @param direction Endpoint direction (in/out).
    127126 * @return Error code.
    … …  
    129128int usb_endpoint_pipe_initialize(usb_endpoint_pipe_t *pipe,
    130129    usb_device_connection_t *connection, usb_endpoint_t endpoint_no,
    131     usb_transfer_type_t transfer_type, size_t max_packet_size,
    132     usb_direction_t direction)
     130    usb_transfer_type_t transfer_type, usb_direction_t direction)
    133131{
    134132        assert(pipe);
    … …  
    139137        pipe->endpoint_no = endpoint_no;
    140138        pipe->transfer_type = transfer_type;
    141         pipe->max_packet_size = max_packet_size;
    142139        pipe->direction = direction;
    143140
    … …  
    159156
    160157        int rc = usb_endpoint_pipe_initialize(pipe, connection,
    161             0, USB_TRANSFER_CONTROL, 8, USB_DIRECTION_BOTH);
     158            0, USB_TRANSFER_CONTROL, USB_DIRECTION_BOTH);
    162159
    163160        return rc;

  • uspace/lib/usb/src/recognise.c

    r67b6fc5 re0df6c2  
    3636#include <usb_iface.h>
    3737#include <usb/usbdrv.h>
    38 #include <usb/pipes.h>
    39 #include <usb/recognise.h>
    40 #include <usb/request.h>
    4138#include <usb/classes/classes.h>
    4239#include <stdio.h>
    4340#include <errno.h>
    44 
    45 static size_t device_name_index = 0;
    46 static FIBRIL_MUTEX_INITIALIZE(device_name_index_mutex);
    4741
    4842/** Callback for getting host controller handle.
    … …  
    161155                /* First, with release number. */
    162156                rc = usb_add_match_id(matches, 100,
    163                     "usb&vendor=0x%04x&product=0x%04x&release=" BCD_FMT,
     157                    "usb&vendor=%d&product=%d&release=" BCD_FMT,
    164158                    (int) device_descriptor->vendor_id,
    165159                    (int) device_descriptor->product_id,
    … …  
    170164               
    171165                /* Next, without release number. */
    172                 rc = usb_add_match_id(matches, 90,
    173                     "usb&vendor=0x%04x&product=0x%04x",
     166                rc = usb_add_match_id(matches, 90, "usb&vendor=%d&product=%d",
    174167                    (int) device_descriptor->vendor_id,
    175168                    (int) device_descriptor->product_id);
    … …  
    248241/** Add match ids based on configuration descriptor.
    249242 *
    250  * @param pipe Control pipe to the device.
     243 * @param hc Open phone to host controller.
    251244 * @param matches Match ids list to add matches to.
     245 * @param address USB address of the attached device.
    252246 * @param config_count Number of configurations the device has.
    253247 * @return Error code.
    254248 */
    255 static int usb_add_config_descriptor_match_ids(usb_endpoint_pipe_t *pipe,
    256     match_id_list_t *matches, int config_count)
     249static int usb_add_config_descriptor_match_ids(int hc,
     250    match_id_list_t *matches, usb_address_t address,
     251    int config_count)
    257252{
    258253        int final_rc = EOK;
    … …  
    262257                int rc;
    263258                usb_standard_configuration_descriptor_t config_descriptor;
    264                 rc = usb_request_get_bare_configuration_descriptor(pipe,
    265                     config_index, &config_descriptor);
     259                rc = usb_drv_req_get_bare_configuration_descriptor(hc,
     260                    address,  config_index, &config_descriptor);
    266261                if (rc != EOK) {
    267262                        final_rc = rc;
    … …  
    272267                void *full_config_descriptor
    273268                    = malloc(config_descriptor.total_length);
    274                 rc = usb_request_get_full_configuration_descriptor(pipe,
    275                     config_index,
     269                rc = usb_drv_req_get_full_configuration_descriptor(hc,
     270                    address, config_index,
    276271                    full_config_descriptor, config_descriptor.total_length,
    277272                    &full_config_descriptor_size);
    … …  
    304299 * function exits with error.
    305300 *
    306  * @param ctrl_pipe Control pipe to given device (session must be already
    307  *      started).
     301 * @param hc Open phone to host controller.
    308302 * @param matches Initialized list of match ids.
    309  * @return Error code.
    310  */
    311 int usb_device_create_match_ids(usb_endpoint_pipe_t *ctrl_pipe,
    312     match_id_list_t *matches)
     303 * @param address USB address of the attached device.
     304 * @return Error code.
     305 */
     306int usb_drv_create_device_match_ids(int hc, match_id_list_t *matches,
     307    usb_address_t address)
    313308{
    314309        int rc;
     310       
    315311        /*
    316312         * Retrieve device descriptor and add matches from it.
    … …  
    318314        usb_standard_device_descriptor_t device_descriptor;
    319315
    320         rc = usb_request_get_device_descriptor(ctrl_pipe, &device_descriptor);
     316        rc = usb_drv_req_get_device_descriptor(hc, address,
     317            &device_descriptor);
    321318        if (rc != EOK) {
    322319                return rc;
    323320        }
    324 
     321       
    325322        rc = usb_drv_create_match_ids_from_device_descriptor(matches,
    326323            &device_descriptor);
    … …  
    328325                return rc;
    329326        }
    330 
     327       
    331328        /*
    332329         * Go through all configurations and add matches
    333330         * based on interface class.
    334331         */
    335         rc = usb_add_config_descriptor_match_ids(ctrl_pipe, matches,
    336             device_descriptor.configuration_count);
     332        rc = usb_add_config_descriptor_match_ids(hc, matches,
     333            address, device_descriptor.configuration_count);
    337334        if (rc != EOK) {
    338335                return rc;
    … …  
    350347}
    351348
     349
    352350/** Probe for device kind and register it in devman.
    353351 *
     352 * @param[in] hc Open phone to the host controller.
     353 * @param[in] parent Parent device.
    354354 * @param[in] address Address of the (unknown) attached device.
    355  * @param[in] hc_handle Handle of the host controller.
    356  * @param[in] parent Parent device.
    357355 * @param[out] child_handle Handle of the child device.
    358356 * @return Error code.
    359357 */
    360 int usb_device_register_child_in_devman(usb_address_t address,
    361     devman_handle_t hc_handle,
    362     device_t *parent, devman_handle_t *child_handle)
    363 {
     358int usb_drv_register_child_in_devman(int hc, device_t *parent,
     359    usb_address_t address, devman_handle_t *child_handle)
     360{
     361        static size_t device_name_index = 0;
     362        static FIBRIL_MUTEX_INITIALIZE(device_name_index_mutex);
     363
    364364        size_t this_device_name_index;
    365365
    … …  
    369369        fibril_mutex_unlock(&device_name_index_mutex);
    370370
     371
    371372        device_t *child = NULL;
    372373        char *child_name = NULL;
    373374        int rc;
    374         usb_device_connection_t dev_connection;
    375         usb_endpoint_pipe_t ctrl_pipe;
    376 
    377         rc = usb_device_connection_initialize(&dev_connection, hc_handle, address);
    378         if (rc != EOK) {
    379                 goto failure;
    380         }
    381 
    382         rc = usb_endpoint_pipe_initialize_default_control(&ctrl_pipe,
    383             &dev_connection);
    384         if (rc != EOK) {
    385                 goto failure;
    386         }
    387375
    388376        child = create_device();
    … …  
    403391        child->name = child_name;
    404392        child->ops = &child_ops;
    405 
    406         rc = usb_endpoint_pipe_start_session(&ctrl_pipe);
    407         if (rc != EOK) {
    408                 goto failure;
    409         }
    410 
    411         rc = usb_device_create_match_ids(&ctrl_pipe, &child->match_ids);
    412         if (rc != EOK) {
    413                 goto failure;
    414         }
    415 
    416         rc = usb_endpoint_pipe_end_session(&ctrl_pipe);
     393       
     394        rc = usb_drv_create_device_match_ids(hc, &child->match_ids, address);
    417395        if (rc != EOK) {
    418396                goto failure;
    … …  
    427405                *child_handle = child->handle;
    428406        }
    429 
     407       
    430408        return EOK;
    431409
    … …  
    441419
    442420        return rc;
     421
    443422}
    444423
Note: See TracChangeset for help on using the changeset viewer.