Changeset fee6381 in mainline

Timestamp:

2011-04-07T20:22:57Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

7f2e33a

Parents:

f8e8738 (diff), 64dbc83 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Changes from maklf

Location:

uspace/lib/usb

Files:

• include/usb/classes/hidparser.h (modified) (2 diffs)
• src/hidparser.c (modified) (5 diffs)

uspace/lib/usb/include/usb/classes/hidparser.h

@@ -92 +92 @@
         /** */  
         link_t link;
+
 } usb_hid_report_path_t;
 
@@ -158 +159 @@
         
         int use_report_id;
-        
+
+        /** */
+        link_t stack;
 } usb_hid_report_parser_t;      
 

uspace/lib/usb/src/hidparser.c

@@ -64 +64 @@
 int usb_hid_report_reset_local_items();
 void usb_hid_free_report_list(link_t *head);
-
+usb_hid_report_item_t *usb_hid_report_item_clone(const usb_hid_report_item_t *item);
 /*
  * Data translation private functions
@@ -105 +105 @@
     list_initialize(&(parser->output));
     list_initialize(&(parser->feature));
+
+        list_initialize(&(parser->stack));
 
         parser->use_report_id = 0;
@@ -220 +222 @@
                                         if(!(new_report_item = malloc(sizeof(usb_hid_report_item_t)))) {
                                                 return ENOMEM;
-                                        }
+                                        }                                       
                                         memcpy(new_report_item,report_item, sizeof(usb_hid_report_item_t));
+                                        link_initialize(&(new_report_item->link));
+                                        
                                         /* reset local items */
                                         new_report_item->usage_minimum = 0;
                                         new_report_item->usage_maximum = 0;
+                                        new_report_item->designator_index = 0;
+                                        new_report_item->designator_minimum = 0;
+                                        new_report_item->designator_maximum = 0;
+                                        new_report_item->string_index = 0;
+                                        new_report_item->string_minimum = 0;
+                                        new_report_item->string_maximum = 0;
+
+                                        /* reset usage from current usage path */
+                                        usb_hid_report_usage_path_t *path = list_get_instance(&usage_path->link, usb_hid_report_usage_path_t, link);
+                                        path->usage = 0;
                                         
-                                        link_initialize(&(new_report_item->link));
                                         report_item = new_report_item;
                                                                                 
@@ -232 +245 @@
                                 case USB_HID_REPORT_TAG_PUSH:
                                         // push current state to stack
-                                        // not yet implemented
+                                        new_report_item = usb_hid_report_item_clone(report_item);
+                                        list_prepend (&parser->stack, &new_report_item->link);
+                                        
                                         break;
                                 case USB_HID_REPORT_TAG_POP:
                                         // restore current state from stack
-                                        // not yet implemented                                             
+                                        if(list_empty (&parser->stack)) {
+                                                return EINVAL;
+                                        }
+                                        
+                                        report_item = list_get_instance(&parser->stack, usb_hid_report_item_t, link);
+                                        list_remove (parser->stack.next);
+                                        
                                         break;
                                         
@@ -1363 +1384 @@
 }
 
+
+usb_hid_report_item_t *usb_hid_report_item_clone(const usb_hid_report_item_t *item)
+{
+        usb_hid_report_item_t *new_report_item;
+        
+        if(!(new_report_item = malloc(sizeof(usb_hid_report_item_t)))) {
+                return NULL;
+        }                                       
+        memcpy(new_report_item,item, sizeof(usb_hid_report_item_t));
+        link_initialize(&(new_report_item->link));
+
+        return new_report_item;
+}
+
 /**
  * @}