Minor cleanups.

[seabios.git] / src / cdrom.c

diff --git a/src/cdrom.c b/src/cdrom.c
index 55db9b5d0fa1fe57877862a8e82e68e16c2c5662..cf77584eda9af6de04e1ea786de8320aeaf782be 100644 (file)
--- a/src/cdrom.c
+++ b/src/cdrom.c
@@ -296,7 +296,8 @@ atapi_get_sense(u16 device, u8 *asc, u8 *ascq)
     atacmd[0] = ATA_CMD_REQUEST_SENSE;
     atacmd[4] = sizeof(buffer);
     u16 ret = ata_cmd_packet(device, atacmd, sizeof(atacmd)
-                             , 0, sizeof(buffer), GET_SEG(SS), (u32)buffer);
+                             , 0, sizeof(buffer)
+                             , MAKE_32_PTR(GET_SEG(SS), (u32)buffer));
     if (ret != 0)
         return 0x0002;
 
@@ -332,7 +333,8 @@ atapi_is_ready(u16 device)
             return -1;
         }
         u16 ret = ata_cmd_packet(device, packet, sizeof(packet)
-                                 , 0, sizeof(buf), GET_SEG(SS), (u32)buf);
+                                 , 0, sizeof(buf)
+                                 , MAKE_32_PTR(GET_SEG(SS), (u32)buf));
         if (ret == 0)
             break;
 
@@ -429,7 +431,8 @@ cdrom_boot()
 
     // Read the Boot Record Volume Descriptor
     u8 buffer[2048];
-    ret = cdrom_read(device, 0x11, 2048, GET_SEG(SS), (u32)buffer, 0);
+    ret = cdrom_read(device, 0x11, 2048
+                     , MAKE_32_PTR(GET_SEG(SS), (u32)buffer), 0);
     if (ret)
         return 3;
 
@@ -443,7 +446,8 @@ cdrom_boot()
     u32 lba = *(u32*)&buffer[0x47];
 
     // And we read the Boot Catalog
-    ret = cdrom_read(device, lba, 2048, GET_SEG(SS), (u32)buffer, 0);
+    ret = cdrom_read(device, lba, 2048
+                     , MAKE_32_PTR(GET_SEG(SS), (u32)buffer), 0);
     if (ret)
         return 7;
 
@@ -489,7 +493,7 @@ cdrom_boot()
 
     // And we read the image in memory
     ret = cdrom_read(device, lba, nbsectors*512
-                     , boot_segment, 0, 0);
+                     , MAKE_32_PTR(boot_segment, 0), 0);
     if (ret)
         return 12;