Changeset 266fcd8 in mainline for uspace/app/mkbd/main.c

Timestamp:

2011-05-27T09:27:02Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

81d2f6a

Parents:

3c9eb46

Message:

Sending event number in get_event() interface + control in mkbd.

File:

• uspace/app/mkbd/main.c (modified) (7 diffs)

uspace/app/mkbd/main.c

@@ -140 +140 @@
         assert(report != NULL);
         
-        printf("Calling usb_hid_parse_report() with size %zu and "
-            "buffer: \n", size);
-        for (size_t i = 0; i < size; ++i) {
-                printf(" %X ", buffer[i]);
-        }
-        printf("\n");
+//      printf("Calling usb_hid_parse_report() with size %zu and "
+//          "buffer: \n", size);
+//      for (size_t i = 0; i < size; ++i) {
+//              printf(" %X ", buffer[i]);
+//      }
+//      printf("\n");
         
         uint8_t report_id;
         int rc = usb_hid_parse_report(report, buffer, size, &report_id);
         if (rc != EOK) {
-                printf("Error parsing report: %s\n", str_error(rc));
+//              printf("Error parsing report: %s\n", str_error(rc));
                 return;
         }
@@ -168 +168 @@
             USB_HID_REPORT_TYPE_INPUT);
         
+//      printf("Field: %p\n", field);
+        
         while (field != NULL) {
+//              printf("Field usage: %u, field value: %d\n", field->usage, 
+//                  field->value);
                 if (field->value != 0) {
                         const char *key_str = 
@@ -179 +183 @@
                     | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, 
                     USB_HID_REPORT_TYPE_INPUT);
+//              printf("Next field: %p\n", field);
         }
         
@@ -200 +205 @@
 int main(int argc, char *argv[])
 {
+        int act_event = -1;
         
         if (argc <= 1) {
@@ -255 +261 @@
         }
         
-        printf("Event length: %zu\n", size);
+//      printf("Event length: %zu\n", size);
         uint8_t *event = (uint8_t *)malloc(size);
         if (event == NULL) {
@@ -262 +268 @@
         }
         
-        printf("Event length: %zu\n", size);
+//      printf("Event length: %zu\n", size);
         
         size_t actual_size;
+        int event_nr;
         
         while (1) {
                 // get event from the driver
-                printf("Getting event from the driver.\n");
+//              printf("Getting event from the driver.\n");
                 
                 /** @todo Try blocking call. */
                 rc = usbhid_dev_get_event(dev_phone, event, size, &actual_size, 
-                    0);
+                    &event_nr, 0);
                 if (rc != EOK) {
                         // hangup phone?
@@ -280 +287 @@
                 }
                 
-                printf("Got buffer: %p, size: %zu, max size: %zu\n", event, 
-                    actual_size, size);
-                
-                print_key(event, size, report);
-                
-                async_usleep(10000);
+//              printf("Got buffer: %p, size: %zu, max size: %zu\n", event, 
+//                  actual_size, size);
+                
+//              printf("Event number: %d, my actual event: %d\n", event_nr, 
+//                  act_event);
+                if (event_nr > act_event) {
+                        print_key(event, size, report);
+                        act_event = event_nr;
+                }
+                
+                async_usleep(100000);
         }