Changes in / [9c0f158:96bfe76] in mainline


Ignore:
Files:
17 added
15 deleted
8 edited

Legend:

Unmodified
Added
Removed

  • boot/arch/amd64/Makefile.inc

    r9c0f158 r96bfe76  
    4949        usbflbk \
    5050        usbhub \
    51         usbkbd \
     51        usbhid \
    5252        usbmid \
    5353        usbmouse \

  • uspace/Makefile

    r9c0f158 r96bfe76  
    122122                drv/uhci-rhd \
    123123                drv/usbflbk \
    124                 drv/usbkbd \
     124                drv/usbhid \
    125125                drv/usbhub \
    126126                drv/usbmid \
    … …  
    142142                drv/uhci-rhd \
    143143                drv/usbflbk \
    144                 drv/usbkbd \
     144                drv/usbhid \
    145145                drv/usbhub \
    146146                drv/usbmid \

  • uspace/app/usbinfo/info.c

    r9c0f158 r96bfe76  
    294294}
    295295
    296 
    297 void dump_status(usbinfo_device_t *dev)
    298 {
    299         int rc;
    300         uint16_t device_status = 0;
    301         uint16_t ctrl_pipe_status = 0;
    302 
    303         /* Device status first. */
    304         rc = usb_request_get_status(&dev->ctrl_pipe,
    305             USB_REQUEST_RECIPIENT_DEVICE, 0,
    306             &device_status);
    307         if (rc != EOK) {
    308                 printf("%sFailed to get device status: %s.\n",
    309                     get_indent(0), str_error(rc));
    310                 goto try_ctrl_pipe_status;
    311         }
    312 
    313         printf("%sDevice status 0x%04x: power=%s, remote-wakeup=%s.\n",
    314             get_indent(0),
    315             device_status,
    316             device_status & USB_DEVICE_STATUS_SELF_POWERED ? "self" : "bus",
    317             device_status & USB_DEVICE_STATUS_REMOTE_WAKEUP ? "yes" : "no");
    318 
    319         /* Interface is not interesting, skipping ;-). */
    320 
    321         /* Control endpoint zero. */
    322 try_ctrl_pipe_status:
    323         rc = usb_request_get_status(&dev->ctrl_pipe,
    324             USB_REQUEST_RECIPIENT_ENDPOINT, 0,
    325             &ctrl_pipe_status);
    326         if (rc != EOK) {
    327                 printf("%sFailed to get control endpoint status: %s.\n",
    328                     get_indent(0), str_error(rc));
    329                 goto leave;
    330         }
    331 
    332         printf("%sControl endpoint zero status %04X: halted=%s.\n",
    333             get_indent(0),
    334             ctrl_pipe_status,
    335             ctrl_pipe_status & USB_ENDPOINT_STATUS_HALTED ? "yes" : "no");
    336 
    337 leave:
    338         return;
    339 }
    340 
    341296/** @}
    342297 */

  • uspace/app/usbinfo/main.c

    r9c0f158 r96bfe76  
    136136        _OPTION("-T --descriptor-tree-full", "Print detailed descriptor tree");
    137137        _OPTION("-s --strings", "Try to print all string descriptors.");
    138         _OPTION("-S --status", "Get status of the device.");
    139138
    140139        printf("\n");
    … …  
    153152        {"descriptor-tree-full", no_argument, NULL, 'T'},
    154153        {"strings", no_argument, NULL, 's'},
    155         {"status", no_argument, NULL, 'S'},
    156154        {0, 0, NULL, 0}
    157155};
    158 static const char *short_options = "himtTsS";
     156static const char *short_options = "himtTs";
    159157
    160158static usbinfo_action_t actions[] = {
    … …  
    182180                .opt = 's',
    183181                .action = dump_strings,
    184                 .active = false
    185         },
    186         {
    187                 .opt = 'S',
    188                 .action = dump_status,
    189182                .active = false
    190183        },

  • uspace/app/usbinfo/usbinfo.h

    r9c0f158 r96bfe76  
    8484void dump_descriptor_tree_full(usbinfo_device_t *);
    8585void dump_strings(usbinfo_device_t *);
    86 void dump_status(usbinfo_device_t *);
    8786
    8887

  • uspace/drv/ohci/batch.c

    r9c0f158 r96bfe76  
    118118        instance->next_step = batch_call_in_and_dispose;
    119119        /* TODO: implement */
    120         usb_log_debug("Batch(%p) CONTROL READ initialized.\n", instance);
     120        usb_log_debug("Batch(%p) CONTROL WRITE initialized.\n", instance);
    121121}
    122122/*----------------------------------------------------------------------------*/

  • uspace/lib/usb/Makefile

    r9c0f158 r96bfe76  
    5050        src/usb.c \
    5151        src/usbdevice.c \
    52         src/hidreq.c \
    53         src/hidreport.c \
    5452        src/host/device_keeper.c \
    5553        src/host/batch.c

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

    r9c0f158 r96bfe76  
    4141#include <usb/pipes.h>
    4242#include <usb/descriptor.h>
    43 
    44 /** USB device status - device is self powered (opposed to bus powered). */
    45 #define USB_DEVICE_STATUS_SELF_POWERED ((uint16_t)(1 << 0))
    46 
    47 /** USB device status - remote wake-up signaling is enabled. */
    48 #define USB_DEVICE_STATUS_REMOTE_WAKEUP ((uint16_t)(1 << 1))
    49 
    50 /** USB endpoint status - endpoint is halted (stalled). */
    51 #define USB_ENDPOINT_STATUS_HALTED ((uint16_t)(1 << 0))
    5243
    5344/** Standard device request. */
Note: See TracChangeset for help on using the changeset viewer.