Changeset 3647 in vbox for trunk/src/VBox

Timestamp:

Jul 16, 2007 3:34:46 PM (18 years ago)

Author:

vboxsync

Message:

don't depend on the deprecated vl_vbox.h header anymore

File:

• trunk/src/VBox/Devices/Storage/DrvVmdk.cpp (modified) (11 diffs)

trunk/src/VBox/Devices/Storage/DrvVmdk.cpp

@@ -63 +63 @@
 #include <iprt/string.h>
 
-#include "vl_vbox.h"
 #include "Builtins.h"
 
@@ -217 +216 @@
     if (buf_size < 4)
         return 0;
-    magic = be32_to_cpu(*(uint32_t *)buf);
+    magic = RT_BE2H_U32(*(uint32_t *)buf);
     if (magic == VMDK3_MAGIC ||
         magic == VMDK4_MAGIC)
@@ -261 +260 @@
         goto fail;
 
-    magic = be32_to_cpu(magic);
+    magic = RT_BE2H_U32(magic);
     if (magic == VMDK3_MAGIC)
     {
@@ -269 +268 @@
         if (VBOX_FAILURE(rc))
             goto fail;
-        s->cluster_sectors = le32_to_cpu(header.granularity);
+        s->cluster_sectors = RT_LE2H_U32(header.granularity);
         s->l2_size = 1 << 9;
         s->l1_size = 1 << 6;
-        s->total_sectors = le32_to_cpu(header.disk_sectors);
-        s->l1_table_offset = le32_to_cpu(header.l1dir_offset) << 9;
+        s->total_sectors = RT_LE2H_U32(header.disk_sectors);
+        s->l1_table_offset = RT_LE2H_U32(header.l1dir_offset) << 9;
         s->l1_backup_table_offset = 0;
         s->l1_entry_sectors = s->l2_size * s->cluster_sectors;
 
         /* fill in the geometry structure */
-        pDisk->Geometry.cCylinders = le32_to_cpu(header.cylinders);
-        pDisk->Geometry.cHeads = le32_to_cpu(header.heads);
-        pDisk->Geometry.cSectors = le32_to_cpu(header.sectors_per_track);
+        pDisk->Geometry.cCylinders = RT_LE2H_U32(header.cylinders);
+        pDisk->Geometry.cHeads = RT_LE2H_U32(header.heads);
+        pDisk->Geometry.cSectors = RT_LE2H_U32(header.sectors_per_track);
         pDisk->Geometry.cbSector = VMDK_GEOMETRY_SECTOR_SIZE;
     }
@@ -291 +290 @@
         if (VBOX_FAILURE(rc))
             goto fail;
-        s->total_sectors = le64_to_cpu(header.capacity);
-        s->cluster_sectors = le64_to_cpu(header.granularity);
-        s->l2_size = le32_to_cpu(header.num_gtes_per_gte);
+        s->total_sectors = RT_LE2H_U64(header.capacity);
+        s->cluster_sectors = RT_LE2H_U64(header.granularity);
+        s->l2_size = RT_LE2H_U32(header.num_gtes_per_gte);
         s->l1_entry_sectors = s->l2_size * s->cluster_sectors;
         if (s->l1_entry_sectors <= 0)
@@ -302 +301 @@
         s->l1_size = (s->total_sectors + s->l1_entry_sectors - 1)
             / s->l1_entry_sectors;
-        s->l1_table_offset = le64_to_cpu(header.rgd_offset) << 9;
-        s->l1_backup_table_offset = le64_to_cpu(header.gd_offset) << 9;
+        s->l1_table_offset = RT_LE2H_U64(header.rgd_offset) << 9;
+        s->l1_backup_table_offset = RT_LE2H_U64(header.gd_offset) << 9;
 
         /* fill in the geometry structure */
@@ -309 +308 @@
         //  of the Disk DescriptorFile. So, the below values are just a
         //  quick hack.
-        pDisk->Geometry.cCylinders = RT_MIN((le64_to_cpu(header.capacity) /
+        pDisk->Geometry.cCylinders = RT_MIN((RT_LE2H_U64(header.capacity) /
                                       (16 * 63)), 16383);
         pDisk->Geometry.cHeads = 16;
@@ -337 +336 @@
         goto fail;
     for(i = 0; i < s->l1_size; i++) {
-        le32_to_cpus(&s->l1_table[i]);
+        s->l1_table[i] = RT_LE2H_U32(s->l1_table[i]);
     }
 
@@ -356 +355 @@
             goto fail;
         for(i = 0; i < s->l1_size; i++) {
-            le32_to_cpus(&s->l1_backup_table[i]);
+            s->l1_backup_table[i] = RT_LE2H_U32(s->l1_backup_table[i]);
         }
     }
@@ -430 +429 @@
  found:
     l2_index = ((offset >> 9) / s->cluster_sectors) % s->l2_size;
-    cluster_offset = le32_to_cpu(l2_table[l2_index]);
+    cluster_offset = RT_LE2H_U32(l2_table[l2_index]);
     if (!cluster_offset) {
         if (!allocate)
@@ -444 +443 @@
         cluster_offset >>= 9;
         /* update L2 table */
-        tmp = cpu_to_le32(cluster_offset);
+        tmp = RT_H2LE_U32(cluster_offset);
         l2_table[l2_index] = tmp;
         rc = RTFileSeek(s->File, ((int64_t)l2_offset * VMDK_GEOMETRY_SECTOR_SIZE) + (l2_index * sizeof(tmp)), RTFILE_SEEK_BEGIN, NULL);