Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/bus/usb/usbhid/main.c

    rbb70637 r920d0fc  
    6565        }
    6666
    67         if (usb_device_get_iface_number(dev) < 0) {
     67        if (dev->interface_no < 0) {
    6868                usb_log_error("Failed to add HID device: endpoints not found."
    6969                    "\n");
     
    8989         * This will create a separate fibril that will query the device
    9090         * for the data continuously. */
    91         rc = usb_device_auto_poll_desc(dev,
     91       rc = usb_device_auto_poll(dev,
    9292           /* Index of the polling pipe. */
    93            hid_dev->poll_pipe_mapping->description,
     93           hid_dev->poll_pipe_index,
    9494           /* Callback when data arrives. */
    9595           usb_hid_polling_callback,
    9696           /* How much data to request. */
    97            hid_dev->poll_pipe_mapping->pipe.max_packet_size,
    98            /* Delay */
    99            -1,
     97           dev->pipes[hid_dev->poll_pipe_index].pipe.max_packet_size,
    10098           /* Callback when the polling ends. */
    10199           usb_hid_polling_ended_callback,
     
    105103        if (rc != EOK) {
    106104                usb_log_error("Failed to start polling fibril for `%s'.\n",
    107                     usb_device_get_name(dev));
     105                    ddf_dev_get_name(dev->ddf_dev));
    108106                usb_hid_deinit(hid_dev);
    109107                return rc;
     
    111109        hid_dev->running = true;
    112110
    113         usb_log_info("HID device `%s' ready.\n", usb_device_get_name(dev));
     111        usb_log_info("HID device `%s' ready to use.\n",
     112            ddf_dev_get_name(dev->ddf_dev));
    114113
    115114        return EOK;
     
    138137{
    139138        assert(dev);
    140         usb_hid_dev_t *hid_dev = usb_device_data_get(dev);
    141         assert(hid_dev);
     139        assert(dev->driver_data);
     140        usb_hid_dev_t *hid_dev = dev->driver_data;
    142141        unsigned tries = 100;
    143142        /* Wait for fail. */
     
    151150
    152151        usb_hid_deinit(hid_dev);
    153         usb_log_debug2("%s destruction complete.\n", usb_device_get_name(dev));
     152        usb_log_debug2("%s destruction complete.\n", ddf_dev_get_name(dev->ddf_dev));
    154153        return EOK;
    155154}
Note: See TracChangeset for help on using the changeset viewer.