Changeset 42811 in vbox for trunk

Timestamp:

Aug 14, 2012 4:00:48 PM (13 years ago)

Author:

vboxsync

Message:

BIOS: Use macros for getting controller specific device numbers.

Location:

trunk/src/VBox/Devices/PC/BIOS

Files:

• ahci.c (modified) (3 diffs)
• scsi.c (modified) (2 diffs)

trunk/src/VBox/Devices/PC/BIOS/ahci.c

@@ -491 +491 @@
     uint16_t        device_id;
 
-    device_id = bios_dsk->drqp.dev_id - BX_MAX_ATA_DEVICES - BX_MAX_SCSI_DEVICES;
+    device_id = VBOX_GET_AHCI_DEVICE(bios_dsk->drqp.dev_id);
     if (device_id > BX_MAX_AHCI_DEVICES)
         BX_PANIC("%s: device_id out of range %d\n", __func__, device_id);
@@ -520 +520 @@
     uint16_t        device_id;
 
-    device_id = bios_dsk->drqp.dev_id - BX_MAX_ATA_DEVICES - BX_MAX_SCSI_DEVICES;
+    device_id = VBOX_GET_AHCI_DEVICE(bios_dsk->drqp.dev_id);
     if (device_id > BX_MAX_AHCI_DEVICES)
         BX_PANIC("%s: device_id out of range %d\n", __func__, device_id);
@@ -559 +559 @@
 
     /* Convert to AHCI specific device number. */
-    device_id = device_id - BX_MAX_ATA_DEVICES - BX_MAX_SCSI_DEVICES;
+    device_id = VBOX_GET_AHCI_DEVICE(device_id);
 
     DBG_AHCI("%s: reading %lu bytes, skip %u/%u, device %d, port %d\n", __func__,

trunk/src/VBox/Devices/PC/BIOS/scsi.c

@@ -163 +163 @@
     uint8_t             device_id;
 
-    device_id = bios_dsk->drqp.dev_id - BX_MAX_ATA_DEVICES;
+    device_id = VBOX_GET_SCSI_DEVICE(bios_dsk->drqp.dev_id);
     if (device_id > BX_MAX_SCSI_DEVICES)
         BX_PANIC("scsi_read_sectors: device_id out of range %d\n", device_id);
@@ -208 +208 @@
     uint8_t             device_id;
 
-    device_id = bios_dsk->drqp.dev_id - BX_MAX_ATA_DEVICES;
+    device_id = VBOX_GET_SCSI_DEVICE(bios_dsk->drqp.dev_id);
     if (device_id > BX_MAX_SCSI_DEVICES)
         BX_PANIC("scsi_write_sectors: device_id out of range %d\n", device_id);