Changeset 6e6dc7d in mainline

Timestamp:

2011-02-20T17:31:21Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

51f0e410

Parents:

c723b772

Message:

Refactoring of match id creation

File:

• uspace/lib/usb/src/recognise.c (modified) (8 diffs)

uspace/lib/usb/src/recognise.c

@@ -112 +112 @@
 }
 
+#define ADD_MATCHID_OR_RETURN(match_ids, score, format, ...) \
+        do { \
+                int __rc = usb_add_match_id((match_ids), (score), \
+                    format, ##__VA_ARGS__); \
+                if (__rc != EOK) { \
+                        return __rc; \
+                } \
+        } while (0)
+
 /** Create device match ids based on its interface.
  *
@@ -131 +140 @@
         }
 
-        int rc;
-
         if (descriptor->interface_class == USB_CLASS_USE_INTERFACE) {
                 return ENOENT;
@@ -140 +147 @@
         assert(classname != NULL);
 
-        rc = usb_add_match_id(matches, 50,
+        ADD_MATCHID_OR_RETURN(matches, 50,
             "usb&interface&class=%s",
             classname);
-        if (rc != EOK) {
-                return rc;
-        }
-
-        rc = usb_add_match_id(matches, 70,
+        ADD_MATCHID_OR_RETURN(matches, 70,
             "usb&interface&class=%s&subclass=0x%02x",
             classname, descriptor->interface_subclass);
-        if (rc != EOK) {
-                return rc;
-        }
-
-        rc = usb_add_match_id(matches, 100,
+        ADD_MATCHID_OR_RETURN(matches, 100,
             "usb&interface&class=%s&subclass=0x%02x&protocol=0x%02x",
             classname, descriptor->interface_subclass,
             descriptor->interface_protocol);
 
-        return rc;
+        return EOK;
 }
 
@@ -172 +171 @@
     const usb_standard_device_descriptor_t *device_descriptor)
 {
-        int rc;
-        
         /*
          * Unless the vendor id is 0, the pair idVendor-idProduct
@@ -180 +177 @@
         if (device_descriptor->vendor_id != 0) {
                 /* First, with release number. */
-                rc = usb_add_match_id(matches, 100,
+                ADD_MATCHID_OR_RETURN(matches, 100,
                     "usb&vendor=0x%04x&product=0x%04x&release=" BCD_FMT,
                     (int) device_descriptor->vendor_id,
                     (int) device_descriptor->product_id,
                     BCD_ARGS(device_descriptor->device_version));
-                if (rc != EOK) {
-                        return rc;
-                }
                 
                 /* Next, without release number. */
-                rc = usb_add_match_id(matches, 90,
+                ADD_MATCHID_OR_RETURN(matches, 90,
                     "usb&vendor=0x%04x&product=0x%04x",
                     (int) device_descriptor->vendor_id,
                     (int) device_descriptor->product_id);
-                if (rc != EOK) {
-                        return rc;
-                }
         }       
 
@@ -204 +195 @@
          */
         if (device_descriptor->device_class != USB_CLASS_USE_INTERFACE) {
-                rc = usb_add_match_id(matches, 50, "usb&class=%s",
+                ADD_MATCHID_OR_RETURN(matches, 50, "usb&class=%s",
                     usb_str_class(device_descriptor->device_class));
-                if (rc != EOK) {
-                        return rc;
-                }
         } else {
-                rc = usb_add_match_id(matches, 50, "usb&mid");
-                if (rc != EOK) {
-                        return rc;
-                }
+                ADD_MATCHID_OR_RETURN(matches, 50, "usb&mid");
         }
         
@@ -260 +245 @@
                     current_descriptor;
                 
-                int rc = usb_add_match_id(matches, 50,
+                ADD_MATCHID_OR_RETURN(matches, 50,
                     "usb&interface&class=%s",
                     usb_str_class(interface->interface_class));
-                if (rc != EOK) {
-                        return rc;
-                }
         }
         
@@ -367 +349 @@
          * As a fallback, provide the simplest match id possible.
          */
-        rc = usb_add_match_id(matches, 1, "usb&fallback");
-        if (rc != EOK) {
-                return rc;
-        }
+        ADD_MATCHID_OR_RETURN(matches, 1, "usb&fallback");
 
         return EOK;