Changeset d4ee4e2 in mainline for uspace/lib/usb/src/usbdrv.c

Timestamp:

2011-02-14T21:52:56Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

324fa1e, 69b1f3d

Parents:

bfe0eb5 (diff), 47c573a (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 improvements of pipe API

Mostly cleaning and refactoring.

File:

• uspace/lib/usb/src/usbdrv.c (modified) (2 diffs)

uspace/lib/usb/src/usbdrv.c

@@ -464 +464 @@
         assert(setup_packet != NULL);
         assert(setup_packet_size > 0);
-        assert(buffer != NULL);
-        assert(buffer_size > 0);
+        assert(((buffer != NULL) && (buffer_size > 0))
+            || ((buffer == NULL) && (buffer_size == 0)));
         assert(handle != NULL);
 
@@ -494 +494 @@
         }
 
-        rc = async_data_write_start(phone, buffer, buffer_size);
-        if (rc != EOK) {
-                async_wait_for(transfer->request, NULL);
-                return rc;
+        if (buffer_size > 0) {
+                rc = async_data_write_start(phone, buffer, buffer_size);
+                if (rc != EOK) {
+                        async_wait_for(transfer->request, NULL);
+                        return rc;
+                }
         }