Changes in / [fa8f1f7:33577f81] in mainline


Ignore:
Files:
2 added
6 deleted
6 edited

Legend:

Unmodified
Added
Removed
  • .bzrignore

    rfa8f1f7 r33577f81  
    8888./uspace/drv/uhci-hcd/uhci-hcd
    8989./uspace/drv/uhci-rhd/uhci-rhd
    90 ./uspace/drv/usbflbk/usbflbk
    9190./uspace/drv/usbhub/usbhub
    9291./uspace/drv/usbhid/usbhid
  • boot/arch/amd64/Makefile.inc

    rfa8f1f7 r33577f81  
    4747        uhci-hcd \
    4848        uhci-rhd \
    49         usbflbk \
    5049        usbhub \
    5150        usbhid \
  • uspace/Makefile

    rfa8f1f7 r33577f81  
    121121                drv/uhci-hcd \
    122122                drv/uhci-rhd \
    123                 drv/usbflbk \
    124123                drv/usbhid \
    125124                drv/usbhub \
     
    141140                drv/uhci-hcd \
    142141                drv/uhci-rhd \
    143                 drv/usbflbk \
    144142                drv/usbhid \
    145143                drv/usbhub \
  • uspace/app/usbinfo/info.c

    rfa8f1f7 r33577f81  
    109109    usb_standard_device_descriptor_t *descriptor)
    110110{
    111         printf("%sDevice (0x%04x by 0x%04x, %s, %zu configurations)\n", prefix,
     111        printf("%sDevice (0x%04x by 0x%04x, %s)\n", prefix,
    112112            (int) descriptor->product_id,
    113113            (int) descriptor->vendor_id,
    114             usb_str_class(descriptor->device_class),
    115             (size_t) descriptor->configuration_count);
     114            usb_str_class(descriptor->device_class));
    116115}
    117116
     
    119118    usb_standard_configuration_descriptor_t *descriptor)
    120119{
    121         printf("%sConfiguration #%d (%zu interfaces)\n", prefix,
    122             (int) descriptor->configuration_number,
    123             (size_t) descriptor->interface_count);
     120        printf("%sConfiguration #%d\n", prefix,
     121            (int) descriptor->configuration_number);
    124122}
    125123
     
    127125    usb_standard_interface_descriptor_t *descriptor)
    128126{
    129         printf("%sInterface #%d (%s, 0x%02x, 0x%02x), alternate %d\n", prefix,
     127        printf("%sInterface #%d (%s, 0x%02x, 0x%02x)\n", prefix,
    130128            (int) descriptor->interface_number,
    131129            usb_str_class(descriptor->interface_class),
    132130            (int) descriptor->interface_subclass,
    133             (int) descriptor->interface_protocol,
    134             (int) descriptor->alternate_setting);
     131            (int) descriptor->interface_protocol);
    135132}
    136133
  • uspace/doc/doxygroups.h

    rfa8f1f7 r33577f81  
    274274         */
    275275
    276         /**
    277          * @defgroup drvusbfallback USB fallback driver.
    278          * @ingroup usb
    279          * @brief Fallback driver for any USB device.
    280          * @details
    281          * The purpose of this driver is to simplify querying of unknown
    282          * devices from within HelenOS (without a driver, no node at all
    283          * may appear under /dev/devices).
    284          */
    285 
    286 
     276
  • uspace/lib/usb/src/recognise.c

    rfa8f1f7 r33577f81  
    291291        }
    292292       
    293         /* As a last resort, try fallback driver. */
    294         ADD_MATCHID_OR_RETURN(matches, 10, "usb&fallback");
    295 
    296293        return EOK;
    297294}
Note: See TracChangeset for help on using the changeset viewer.