Changeset 96bfe76 in mainline

Timestamp:

2011-03-25T15:18:13Z (14 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

9c0f158

Parents:

b53d3b7

Message:

Output report API

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

@@ -207 +207 @@
     const usb_hid_report_in_callbacks_t *callbacks, void *arg);
 
-int usb_hid_report_input_length(const usb_hid_report_parser_t *parser,
+size_t usb_hid_report_input_length(const usb_hid_report_parser_t *parser,
         usb_hid_report_path_t *path, int flags);
 
@@ -223 +223 @@
 void usb_hid_report_set_last_item(usb_hid_report_path_t *usage_path, int32_t tag, int32_t data);
 int usb_hid_report_compare_usage_path(usb_hid_report_path_t *report_path, usb_hid_report_path_t *path, int flags);
-int     usb_hid_report_path_clone(usb_hid_report_path_t *new_usage_path, usb_hid_report_path_t *usage_path);
-
-
-// output
-//      - funkce co vrati cesty poli v output reportu
-//      - funkce co pro danou cestu nastavi data
-//      - finalize
-
+usb_hid_report_path_t *usb_hid_report_path_clone(usb_hid_report_path_t *usage_path);
+
+
+// output API
+/** Allocates output report buffer*/
+uint8_t *usb_hid_report_output(usb_hid_report_parser_t *parser);
+/** Frees output report buffer*/
+void usb_hid_report_output_free(uint8_t *output);
+
+/** Returns size of output for given usage path */
+size_t usb_hid_report_output_size(usb_hid_report_parser_t *parser,
+                                  usb_hid_report_path_t *path, int flags);
+/** Updates the output report buffer by translated given data */
+int usb_hid_report_output_translate(usb_hid_report_parser_t *parser,
+                                    usb_hid_report_path_t *path, int flags,
+                                    uint8_t *buffer, size_t size,
+                                    int32_t *data, size_t data_size);
 #endif
 /**

uspace/lib/usb/src/hidparser.c

@@ -164 +164 @@
                                         // store current usage path
                                         report_item->usage_path = usage_path;
-
-                                        // new current usage path 
-                                        tmp_usage_path = usb_hid_report_path();
                                         
-                                        // copy old path to the new one
-                                        usb_hid_report_path_clone(tmp_usage_path, usage_path);
+                                        // clone path to the new one
+                                        tmp_usage_path = usb_hid_report_path_clone(usage_path);
 
                                         // swap
@@ -796 +793 @@
 }
 
-int usb_hid_report_input_length(const usb_hid_report_parser_t *parser,
+size_t usb_hid_report_input_length(const usb_hid_report_parser_t *parser,
         usb_hid_report_path_t *path, int flags)
 {       
@@ -949 +946 @@
                         break;
 
-                /* given path must be the end of the report one*/
+                /* compare with only the end of path*/
                 case USB_HID_PATH_COMPARE_END:
                                 report_link = report_path->link.prev;
@@ -1019 +1016 @@
 
 /**
- *
- */
-int     usb_hid_report_path_clone(usb_hid_report_path_t *new_usage_path, usb_hid_report_path_t *usage_path)
+ * Clone content of given usage path to the new one
+ *
+ */
+usb_hid_report_path_t *usb_hid_report_path_clone(usb_hid_report_path_t *usage_path)
 {
         usb_hid_report_usage_path_t *path_item;
         link_t *path_link;
-
+        usb_hid_report_path_t *new_usage_path = usb_hid_report_path ();
+
+        if(new_usage_path == NULL){
+                return NULL;
+        }
         
         if(list_empty(&usage_path->link)){
-                return EOK;
+                return new_usage_path;
         }
 
@@ -1039 +1041 @@
         }
 
-        return EOK;
+        return new_usage_path;
 }