Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed

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

    rda56be2 r65b458c4  
    6262static size_t usb_generic_hid_get_event_length(ddf_fun_t *fun);
    6363
    64 static int usb_generic_hid_get_event(ddf_fun_t *fun, uint8_t *buffer,
     64static int usb_generic_hid_get_event(ddf_fun_t *fun, int32_t *buffer,
    6565    size_t size, size_t *act_size, unsigned int flags);
    6666
    6767static int usb_generic_hid_client_connected(ddf_fun_t *fun);
    68 
    69 static size_t usb_generic_get_report_descriptor_length(ddf_fun_t *fun);
    70 
    71 static int usb_generic_get_report_descriptor(ddf_fun_t *fun, uint8_t *desc,
    72     size_t size, size_t *actual_size);
    7368
    7469/*----------------------------------------------------------------------------*/
    … …  
    7671static usbhid_iface_t usb_generic_iface = {
    7772        .get_event = usb_generic_hid_get_event,
    78         .get_event_length = usb_generic_hid_get_event_length,
    79         .get_report_descriptor_length = usb_generic_get_report_descriptor_length,
    80         .get_report_descriptor = usb_generic_get_report_descriptor
     73        .get_event_length = usb_generic_hid_get_event_length
    8174};
    8275
    … …  
    9083static size_t usb_generic_hid_get_event_length(ddf_fun_t *fun)
    9184{
    92         usb_log_debug("Generic HID: Get event length (fun: %p, "
    93             "fun->driver_data: %p.\n", fun, fun->driver_data);
    94        
    95         if (fun == NULL || fun->driver_data == NULL) {
     85        if (fun == NULL || fun->driver_data) {
    9686                return 0;
    9787        }
    … …  
    9989        usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)fun->driver_data;
    10090       
    101         usb_log_debug("hid_dev: %p, Max input report size (%d).\n",
    102             hid_dev, hid_dev->max_input_report_size);
    103        
    104         return hid_dev->max_input_report_size;
     91        return hid_dev->input_report_size;
    10592}
    10693
    10794/*----------------------------------------------------------------------------*/
    10895
    109 static int usb_generic_hid_get_event(ddf_fun_t *fun, uint8_t *buffer,
     96static int usb_generic_hid_get_event(ddf_fun_t *fun, int32_t *buffer,
    11097    size_t size, size_t *act_size, unsigned int flags)
    11198{
    112         usb_log_debug("Generic HID: Get event.\n");
    113        
    114         if (fun == NULL || fun->driver_data == NULL) {
    115                 usb_log_debug("No function");
     99        if (fun == NULL || fun->driver_data) {
    116100                return EINVAL;
    117101        }
    … …  
    120104       
    121105        if (hid_dev->input_report_size > size) {
    122                 usb_log_debug("input_report_size > size (%zu, %zu)\n",
    123                     hid_dev->input_report_size, size);
    124106                return EINVAL;  // TODO: other error code
    125107        }
    … …  
    127109        /*! @todo This should probably be atomic. */
    128110        if (usb_hid_report_ready()) {
    129                 usb_log_debug("Report ready, size: %zu\n",
    130                     hid_dev->input_report_size);
    131111                memcpy(buffer, hid_dev->input_report,
    132112                    hid_dev->input_report_size);
    … …  
    140120        // note that we already received this report
    141121//      report_received = true;
    142         usb_log_debug("OK\n");
    143        
    144         return EOK;
    145 }
    146 
    147 /*----------------------------------------------------------------------------*/
    148 
    149 static size_t usb_generic_get_report_descriptor_length(ddf_fun_t *fun)
    150 {
    151         usb_log_debug("Generic HID: Get report descriptor length.\n");
    152        
    153         if (fun == NULL || fun->driver_data == NULL) {
    154                 usb_log_debug("No function");
    155                 return EINVAL;
    156         }
    157        
    158         usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)fun->driver_data;
    159        
    160         printf("hid_dev->report_desc_size = %zu\n", hid_dev->report_desc_size);
    161        
    162         return hid_dev->report_desc_size;
    163 }
    164 
    165 /*----------------------------------------------------------------------------*/
    166 
    167 static int usb_generic_get_report_descriptor(ddf_fun_t *fun, uint8_t *desc,
    168     size_t size, size_t *actual_size)
    169 {
    170         usb_log_debug("Generic HID: Get report descriptor.\n");
    171        
    172         if (fun == NULL || fun->driver_data == NULL) {
    173                 usb_log_debug("No function");
    174                 return EINVAL;
    175         }
    176        
    177         usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)fun->driver_data;
    178        
    179         if (hid_dev->report_desc_size > size) {
    180                 return EINVAL;  // TODO: other error code
    181         }
    182        
    183         memcpy(desc, hid_dev->report_desc, hid_dev->report_desc_size);
    184         *actual_size = hid_dev->report_desc_size;
    185122       
    186123        return EOK;
    … …  
    191128static int usb_generic_hid_client_connected(ddf_fun_t *fun)
    192129{
    193         usb_log_debug("Generic HID: Client connected.\n");
    194130        usb_hid_report_received();
    195131        return EOK;
    … …  
    209145                return ENOMEM;
    210146        }
    211        
    212         fun->ops = &usb_generic_hid_ops;
    213         fun->driver_data = hid_dev;
    214147
    215148        int rc = ddf_fun_bind(fun);
    … …  
    221154        }
    222155       
    223         usb_log_debug("HID function created. Handle: %d\n", fun->handle);
     156        fun->ops = &usb_generic_hid_ops;
     157        fun->driver_data = hid_dev;
    224158       
    225159        return EOK;
Note: See TracChangeset for help on using the changeset viewer.