Changeset 16dc887 in mainline for uspace/lib/ext2

Timestamp:

2011-08-16T14:00:32Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

278ac72, b112055

Parents:

3751a08 (diff), cc574511 (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 Location service.

Location:

uspace/lib/ext2

Files:

• libext2_filesystem.c (modified) (3 diffs)
• libext2_filesystem.h (modified) (2 diffs)
• libext2_superblock.c (modified) (2 diffs)
• libext2_superblock.h (modified) (1 diff)

uspace/lib/ext2/libext2_filesystem.c

@@ -50 +50 @@
  * 
  * @param fs                    Pointer to ext2_filesystem_t to initialize
- * @param devmap_handle Device handle of the block device
- * 
- * @return              EOK on success or negative error code on failure
- */
-int ext2_filesystem_init(ext2_filesystem_t *fs, devmap_handle_t devmap_handle)
+ * @param service_id    Service ID of the block device
+ * 
+ * @return              EOK on success or negative error code on failure
+ */
+int ext2_filesystem_init(ext2_filesystem_t *fs, service_id_t service_id)
 {
         int rc;
@@ -60 +60 @@
         size_t block_size;
         
-        fs->device = devmap_handle;
+        fs->device = service_id;
         
         rc = block_init(EXCHANGE_SERIALIZE, fs->device, 2048);
@@ -80 +80 @@
         }
         
-        rc = block_cache_init(devmap_handle, block_size, 0, CACHE_MODE_WT);
+        rc = block_cache_init(service_id, block_size, 0, CACHE_MODE_WT);
         if (rc != EOK) {
                 block_fini(fs->device);

uspace/lib/ext2/libext2_filesystem.h

@@ -43 +43 @@
 
 typedef struct ext2_filesystem {
-        devmap_handle_t         device;
+        service_id_t            device;
         ext2_superblock_t *     superblock;
 } ext2_filesystem_t;
@@ -59 +59 @@
 #define EXT2_SUPPORTED_READ_ONLY_FEATURES 0
 
-extern int ext2_filesystem_init(ext2_filesystem_t *, devmap_handle_t);
+extern int ext2_filesystem_init(ext2_filesystem_t *, service_id_t);
 extern int ext2_filesystem_check_sanity(ext2_filesystem_t *);
 extern int ext2_filesystem_check_flags(ext2_filesystem_t *, bool *);

uspace/lib/ext2/libext2_superblock.c

@@ -321 +321 @@
 /** Read a superblock directly from device (i.e. no libblock cache)
  * 
- * @param devmap_handle Device handle of the block device.
+ * @param service_id    Service ID of the block device.
  * @param superblock    Pointer where to store pointer to new superblock
  * 
  * @return              EOK on success or negative error code on failure.
  */
-int ext2_superblock_read_direct(devmap_handle_t devmap_handle,
+int ext2_superblock_read_direct(service_id_t service_id,
     ext2_superblock_t **superblock)
 {
@@ -337 +337 @@
         }
         
-        rc = block_read_bytes_direct(devmap_handle, EXT2_SUPERBLOCK_OFFSET,
+        rc = block_read_bytes_direct(service_id, EXT2_SUPERBLOCK_OFFSET,
             EXT2_SUPERBLOCK_SIZE, data);
         if (rc != EOK) {

uspace/lib/ext2/libext2_superblock.h

@@ -110 +110 @@
 extern uint32_t ext2_superblock_get_features_read_only(ext2_superblock_t *);
 
-extern int ext2_superblock_read_direct(devmap_handle_t, ext2_superblock_t **);
+extern int ext2_superblock_read_direct(service_id_t, ext2_superblock_t **);
 extern int ext2_superblock_check_sanity(ext2_superblock_t *);