Changeset 42811 in vbox for trunk/src/VBox/Devices/PC/BIOS/scsi.c

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

80056

Message:

BIOS: Use macros for getting controller specific device numbers.

File:

• trunk/src/VBox/Devices/PC/BIOS/scsi.c (modified) (2 diffs)

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);