Changeset ac31040 in mainline for uspace/srv/fs/udf/udf_volume.c

Timestamp:

2012-09-04T19:48:22Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

78ca12b

Parents:

85f7369 (diff), 8ec4144 (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

File:

• uspace/srv/fs/udf/udf_volume.c (modified) (3 diffs)

uspace/srv/fs/udf/udf_volume.c

@@ -151 +151 @@
  *
  */
-void udf_prepare_tag(udf_descriptor_tag_t *tag)
+static void udf_prepare_tag(udf_descriptor_tag_t *tag)
 {
         GET_LE16(tag->id);
@@ -159 +159 @@
         GET_LE16(tag->descriptor_crc_length);
         GET_LE32(tag->location);
+}
+
+/** Read AVD by using one of default sector size from array
+ *
+ * @param service_id
+ * @param avd         Returned value - Anchor Volume Descriptor
+ * @param sector_size Expected sector size
+ *
+ * @return EOK on success or a negative error code.
+ *
+ */
+static int udf_get_anchor_volume_descriptor_by_ssize(service_id_t service_id,
+    udf_anchor_volume_descriptor_t *avd, uint32_t sector_size)
+{
+        int rc = block_read_bytes_direct(service_id,
+            UDF_AVDP_SECTOR * sector_size,
+            sizeof(udf_anchor_volume_descriptor_t), avd);
+        if (rc != EOK)
+                return rc;
+        
+        if (avd->tag.checksum != udf_tag_checksum((uint8_t *) &avd->tag))
+                return EINVAL;
+        
+        // TODO: Should be tested in big-endian mode
+        udf_prepare_tag(&avd->tag);
+        
+        if (avd->tag.id != UDF_TAG_AVDP)
+                return EINVAL;
+        
+        GET_LE32(avd->main_extent.length);
+        GET_LE32(avd->main_extent.location);
+        GET_LE32(avd->reserve_extent.length);
+        GET_LE32(avd->reserve_extent.location);
+        
+        return EOK;
 }
 
@@ -200 +235 @@
         
         return EINVAL;
-}
-
-/** Read AVD by using one of default sector size from array
- *
- * @param service_id
- * @param avd         Returned value - Anchor Volume Descriptor
- * @param sector_size Expected sector size
- *
- * @return EOK on success or a negative error code.
- *
- */
-int udf_get_anchor_volume_descriptor_by_ssize(service_id_t service_id,
-    udf_anchor_volume_descriptor_t *avd, uint32_t sector_size)
-{
-        int rc = block_read_bytes_direct(service_id,
-            UDF_AVDP_SECTOR * sector_size,
-            sizeof(udf_anchor_volume_descriptor_t), avd);
-        if (rc != EOK)
-                return rc;
-        
-        if (avd->tag.checksum != udf_tag_checksum((uint8_t *) &avd->tag))
-                return EINVAL;
-        
-        // TODO: Should be tested in BegEndian mode
-        udf_prepare_tag(&avd->tag);
-        
-        if (avd->tag.id != UDF_TAG_AVDP)
-                return EINVAL;
-        
-        GET_LE32(avd->main_extent.length);
-        GET_LE32(avd->main_extent.location);
-        GET_LE32(avd->reserve_extent.length);
-        GET_LE32(avd->reserve_extent.location);
-        
-        return EOK;
 }