Changeset e7b7ebd5 in mainline

Timestamp:

2011-02-24T12:47:35Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8f840ed

Parents:

92574f4

Message:

Fixed initialization.

Problems introduced when merging:

• Was not saving the size of the report and preparing space for it.
• Was not setting configuration to the device.

File:

• uspace/drv/usbhid/main.c (modified) (2 diffs)

uspace/drv/usbhid/main.c

@@ -557 +557 @@
         // TODO: get descriptors, parse descriptors and save endpoints
         usb_endpoint_pipe_start_session(&kbd_dev->ctrl_pipe);
-        //usb_request_set_configuration(&kbd_dev->ctrl_pipe, 1);
         rc = usbkbd_process_descriptors(kbd_dev);
         usb_endpoint_pipe_end_session(&kbd_dev->ctrl_pipe);
@@ -563 +562 @@
                 goto error_leave;
         }
-
+        
+        // save the size of the report
+        kbd_dev->keycode_count = BOOTP_REPORT_SIZE;
+        kbd_dev->keycodes = (uint8_t *)calloc(
+            kbd_dev->keycode_count, sizeof(uint8_t));
+        
+        if (kbd_dev->keycodes == NULL) {
+                usb_log_fatal("No memory!\n");
+                goto error_leave;
+        }
+        
+        // set configuration to the first one
+        // TODO: handle case with no configurations
+        usb_endpoint_pipe_start_session(&kbd_dev->ctrl_pipe);
+        usb_request_set_configuration(&kbd_dev->ctrl_pipe, 
+            kbd_dev->conf->config_descriptor.configuration_number);
+        usb_endpoint_pipe_end_session(&kbd_dev->ctrl_pipe);
+        
         return kbd_dev;