Changeset db71e2a in mainline for uspace/lib/c/include/bd_srv.h

Timestamp:

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

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, 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/lib/c/include/bd_srv.h (modified) (2 diffs)

uspace/lib/c/include/bd_srv.h

@@ -57 +57 @@
 } bd_srv_t;
 
-typedef struct bd_ops {
+struct bd_ops {
         int (*open)(bd_srvs_t *, bd_srv_t *);
         int (*close)(bd_srv_t *);
@@ -65 +65 @@
         int (*get_block_size)(bd_srv_t *, size_t *);
         int (*get_num_blocks)(bd_srv_t *, aoff64_t *);
-} bd_ops_t;
+};
 
 extern void bd_srvs_init(bd_srvs_t *);