Changeset 7f2e33a in mainline

Timestamp:

2011-04-07T21:48:37Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

dd10e07

Parents:

fee6381

Message:

Fixed requested Report ID, some debugging stuff.

Location:

uspace

Files:

• drv/usbhid/kbd/kbddev.c (modified) (2 diffs)
• drv/usbhid/usbhid.c (modified) (4 diffs)
• drv/usbhid/usbhid.ma (modified) (1 diff)
• drv/usbkbd/kbddev.c (modified) (2 diffs)
• drv/usbkbd/usbkbd.ma (modified) (1 diff)
• lib/usb/src/devpoll.c (modified) (2 diffs)

uspace/drv/usbhid/kbd/kbddev.c

@@ -636 +636 @@
         usb_hid_report_path_t *path = usb_hid_report_path();
         usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_KEYBOARD, 0);
-        usb_hid_report_path_set_report_id(path, 1);
+        usb_hid_report_path_set_report_id(path, 0);
         
         int rc = usb_hid_parse_report(hid_dev->parser, buffer,
@@ -733 +733 @@
         usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_KEYBOARD, 0);
         
-        usb_hid_report_path_set_report_id(path, 1);
+        usb_hid_report_path_set_report_id(path, 0);
         
         kbd_dev->key_count = usb_hid_report_input_length(

uspace/drv/usbhid/usbhid.c

@@ -40 +40 @@
 #include <usb/classes/hidparser.h>
 #include <usb/classes/hidreport.h>
+#include <usb/classes/hidreq.h>
 #include <errno.h>
 
@@ -117 +118 @@
      size_t buffer_size, void *arg)
 {
+        usb_log_debug("Dummy polling callback.\n");
         return false;
 }
@@ -177 +179 @@
         rc = usb_hid_process_report_descriptor(hid_dev->usb_dev, 
             hid_dev->parser);
+        
         if (rc != EOK) {
                 usb_log_warning("Could not process report descriptor.\n");
@@ -240 +243 @@
                 break;
         default:
+//              usbhid_req_set_idle(&hid_dev->usb_dev->ctrl_pipe, 
+//                  hid_dev->usb_dev->interface_no, 0);
                 break;
         }

uspace/drv/usbhid/usbhid.ma

@@ -1 @@
-1000 usb&interface&class=HID&subclass=0x01&protocol=0x02
-1000 usb&interface&class=HID
+100 usb&interface&class=HID&subclass=0x01&protocol=0x02
+100 usb&interface&class=HID

uspace/drv/usbkbd/kbddev.c

@@ -614 +614 @@
         usb_hid_report_path_t *path = usb_hid_report_path();
         usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_KEYBOARD, 0);
-        usb_hid_report_path_set_report_id(path, 1);
+        usb_hid_report_path_set_report_id(path, 0);
         
         int rc = usb_hid_parse_report(kbd_dev->parser, buffer,
@@ -768 +768 @@
         usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_KEYBOARD, 0);
         
-        usb_hid_report_path_set_report_id(path, 1);
+        usb_hid_report_path_set_report_id(path, 0);
         
         kbd_dev->key_count = usb_hid_report_input_length(

uspace/drv/usbkbd/usbkbd.ma

@@ -1 @@
-10 usb&interface&class=HID&subclass=0x01&protocol=0x01
+1000 usb&interface&class=HID&subclass=0x01&protocol=0x01

uspace/lib/usb/src/devpoll.c

@@ -66 +66 @@
         usb_pipe_t *pipe
             = polling_data->dev->pipes[polling_data->pipe_index].pipe;
+        
+        usb_log_debug("Pipe interface number: %d, protocol: %d, subclass: %d, max packet size: %d\n", 
+            polling_data->dev->pipes[polling_data->pipe_index].interface_no,
+            polling_data->dev->pipes[polling_data->pipe_index].description->interface_protocol,
+            polling_data->dev->pipes[polling_data->pipe_index].description->interface_subclass,
+            pipe->max_packet_size);
 
         size_t failed_attempts = 0;
@@ -83 +89 @@
                 /* Quit the session regardless of errors. */
                 usb_pipe_end_session(pipe);
+                
+//              if (rc == ESTALL) {
+//                      usb_log_debug("Seding clear feature...\n");
+//                      usb_request_clear_feature(pipe, USB_REQUEST_TYPE_STANDARD,
+//                        USB_REQUEST_RECIPIENT_ENDPOINT, 0, pipe->endpoint_no);
+//                      continue;
+//              }
 
                 if (rc != EOK) {