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

Timestamp:

2013-09-15T06:33:53Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9348862

Parents:

dd7078c (diff), 1c0cef0 (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.

Major conflicts in USB HC drivers.
Compiles and UHCI works (qemu).
OHCI has device remove problems.

File:

• uspace/srv/fs/cdfs/cdfs_ops.c (modified) (4 diffs)

uspace/srv/fs/cdfs/cdfs_ops.c

@@ -365 +365 @@
         
         /* Check for duplicate entries */
-        list_foreach(parent->cs_list, link) {
-                cdfs_dentry_t *dentry =
-                    list_get_instance(link, cdfs_dentry_t, link);
-                
+        list_foreach(parent->cs_list, link, cdfs_dentry_t, dentry) {
                 if (str_cmp(dentry->name, name) == 0)
                         return EEXIST;
@@ -524 +521 @@
         }
         
-        list_foreach(parent->cs_list, link) {
-                cdfs_dentry_t *dentry =
-                    list_get_instance(link, cdfs_dentry_t, link);
-                
+        list_foreach(parent->cs_list, link, cdfs_dentry_t, dentry) {
                 if (str_cmp(dentry->name, component) == 0) {
                         *fn = get_cached_node(parent->service_id, dentry->index);
@@ -623 +617 @@
 {
         return 0;
+}
+
+static int cdfs_size_block(service_id_t service_id, uint32_t *size)
+{
+        *size = BLOCK_SIZE;
+
+        return EOK; 
+}
+
+static int cdfs_total_block_count(service_id_t service_id, uint64_t *count)
+{
+        *count = 0;
+        
+        return EOK;
+}
+
+static int cdfs_free_block_count(service_id_t service_id, uint64_t *count)
+{
+        *count = 0;
+        
+        return EOK;
 }
 
@@ -641 +656 @@
         .is_directory = cdfs_is_directory,
         .is_file = cdfs_is_file,
-        .service_get = cdfs_service_get
+        .service_get = cdfs_service_get,
+        .size_block = cdfs_size_block,
+        .total_block_count = cdfs_total_block_count,
+        .free_block_count = cdfs_free_block_count
 };