Changeset db71e2a in mainline for uspace/srv/fs/cdfs/cdfs_ops.c

Timestamp:

2013-07-24T17:42:25Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

69b264a9

Parents:

52f1882 (diff), cffa14e6 (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 mainline changes.

usb hc macro changes from mainline were reverted, too many conflicts

File:

• uspace/srv/fs/cdfs/cdfs_ops.c (modified) (1 diff)

uspace/srv/fs/cdfs/cdfs_ops.c

@@ -660 +660 @@
          */
         if ((vol_desc->type != VOL_DESC_PRIMARY) ||
-            (bcmp(vol_desc->standard_ident, CDFS_STANDARD_IDENT, 5) != 0) ||
+            (memcmp(vol_desc->standard_ident, CDFS_STANDARD_IDENT, 5) != 0) ||
             (vol_desc->version != 1)) {
                 block_put(block);