Changeset 132ab5d1 in mainline for uspace/lib/usbhid/src

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (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:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

Location:

uspace/lib/usbhid/src

Files:

• hiddescriptor.c (modified) (12 diffs)
• hidparser.c (modified) (2 diffs)
• hidpath.c (modified) (8 diffs)

uspace/lib/usbhid/src/hiddescriptor.c

@@ -36 +36 @@
 #include <errno.h>
 #include <stdio.h>
-#include <malloc.h>
 #include <mem.h>
 #include <usb/debug.h>
 #include <assert.h>
+#include <stdlib.h>
 
 
@@ -75 +75 @@
 #define USB_HID_RESET_OFFSET    3
 
+#define USB_HID_INVALID                 -98
 /** Unknown tag was founded in report descriptor data*/
 #define USB_HID_UNKNOWN_TAG             -99
@@ -103 +104 @@
                 
                 if(usb_hid_report_compare_usage_path(path, cmp_path,
-                                        USB_HID_PATH_COMPARE_STRICT) == EOK){
+                                        USB_HID_PATH_COMPARE_STRICT) == 0){
                         break;
                 }
@@ -539 +540 @@
 
                 if((ret=usb_hid_report_parse_main_tag(tag, data, item_size,
-                        report_item, usage_path)) == EOK) {
+                        report_item, usage_path)) == 0) {
 
                         return USB_HID_NEW_REPORT_ITEM;
@@ -570 +571 @@
  * @param Length of data buffer
  * @param Current state table
- * @return Error code
+ * @return 0 or USB_HID_ code
  */
 
@@ -585 +586 @@
         case USB_HID_REPORT_TAG_FEATURE:
                 report_item->item_flags = *data;                        
-                return EOK;                     
+                return 0;                       
                 break;
                         
@@ -625 +626 @@
         }
 
-        return EOK;
+        return 0;
 }
 
@@ -635 +636 @@
  * @param Length of data buffer
  * @param Current state table
- * @return Error code
+ * @return 0 or USB_HID_ code
  */
 int usb_hid_report_parse_global_tag(uint8_t tag, const uint8_t *data, 
@@ -711 +712 @@
         }
 
-        return EOK;
+        return 0;
 }
 
@@ -721 +722 @@
  * @param Length of data buffer
  * @param Current state table
- * @return Error code
+ * @return 0 or USB_HID_ code
  */
 int usb_hid_report_parse_local_tag(uint8_t tag, const uint8_t *data,
@@ -777 +778 @@
                             USB_HID_EXTENDED_USAGE_PAGE(
                             usb_hid_report_tag_data_uint32(data, item_size))) {
-                                return EINVAL;
+                                return USB_HID_INVALID;
                         }
                         
@@ -848 +849 @@
         }
         
-        return EOK;
+        return 0;
 }
 

uspace/lib/usbhid/src/hidparser.c

@@ -36 +36 @@
 #include <errno.h>
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <mem.h>
 #include <usb/debug.h>
@@ -518 +518 @@
 
                         if (usb_hid_report_compare_usage_path(
-                            field->collection_path, path, flags) == EOK) {
+                            field->collection_path, path, flags) == 0) {
                                 usb_hid_report_remove_last_item(
                                     field->collection_path);

uspace/lib/usbhid/src/hidpath.c

@@ -36 +36 @@
 #include <errno.h>
 #include <stdio.h>
-#include <malloc.h>
 #include <mem.h>
+#include <stdlib.h>
 #include <usb/debug.h>
 #include <assert.h>
@@ -191 +191 @@
  * @param flags       Flags determining the mode of comparison
  *
- * @return EOK if both paths are identical, non zero number otherwise
+ * @return 0 if both paths are identical, non zero number otherwise
  *
  */
@@ -213 +213 @@
         // Empty path match all others
         if (path->depth == 0) {
-                return EOK;
+                return 0;
         }
         
@@ -239 +239 @@
                                         if (USB_HID_SAME_USAGE(report_item->usage,
                                             path_item->usage))
-                                                return EOK;
+                                                return 0;
                                 } else {
-                                        return EOK;
+                                        return 0;
                                 }
                         }
@@ -285 +285 @@
                     ((report_link == &report_path->items.head) &&
                     (path_link == &path->items.head))) {
-                        return EOK;
+                        return 0;
                 } else {
                         return 1;
@@ -297 +297 @@
                 
                 if (list_empty(&path->items)) {
-                        return EOK;
+                        return 0;
                 }
                 
@@ -320 +320 @@
                 
                 if (path_link == &path->items.head) {
-                        return EOK;
+                        return 0;
                 } else {
                         return 1;
@@ -327 +327 @@
         
         default:
-                return EINVAL;
+                return -1;
         }
 }