Changeset 50176 in vbox for trunk/src/VBox/Devices

Timestamp:

Jan 23, 2014 11:22:18 AM (11 years ago)

Author:

vboxsync

Message:

BIOS: Let the compiler merge info/debug strings better in SCSI module.

File:

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

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

@@ -185 +185 @@
     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);
+        BX_PANIC("%s: device_id out of range %d\n", __func__, device_id);
 
     count    = bios_dsk->drqp.nsect;
@@ -234 +234 @@
     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);
+        BX_PANIC("%s: device_id out of range %d\n", __func__, device_id);
 
     count    = bios_dsk->drqp.nsect;
@@ -600 +600 @@
     {
         /* Detected - Enumerate attached devices. */
-        DBG_SCSI("scsi_init: BusLogic SCSI adapter detected\n");
+        DBG_SCSI("%s: BusLogic SCSI adapter detected\n", __func__);
         outb(BUSLOGIC_BIOS_IO_PORT+VBSCSI_REGISTER_RESET, 0);
         scsi_enumerate_attached_devices(BUSLOGIC_BIOS_IO_PORT);
@@ -606 +606 @@
     else
     {
-        DBG_SCSI("scsi_init: BusLogic SCSI adapter not detected\n");
+        DBG_SCSI("%s: BusLogic SCSI adapter not detected\n", __func__);
     }
 
@@ -616 +616 @@
     {
         /* Detected - Enumerate attached devices. */
-        DBG_SCSI("scsi_init: LSI Logic SCSI adapter detected\n");
+        DBG_SCSI("%s: LSI Logic SCSI adapter detected\n", __func__);
         outb(LSILOGIC_BIOS_IO_PORT+VBSCSI_REGISTER_RESET, 0);
         scsi_enumerate_attached_devices(LSILOGIC_BIOS_IO_PORT);
@@ -622 +622 @@
     else
     {
-        DBG_SCSI("scsi_init: LSI Logic SCSI adapter not detected\n");
+        DBG_SCSI("%s: LSI Logic SCSI adapter not detected\n", __func__);
     }
 
@@ -632 +632 @@
     {
         /* Detected - Enumerate attached devices. */
-        DBG_SCSI("scsi_init: LSI Logic SAS adapter detected\n");
+        DBG_SCSI("%s: LSI Logic SAS adapter detected\n", __func__);
         outb(LSILOGIC_SAS_BIOS_IO_PORT+VBSCSI_REGISTER_RESET, 0);
         scsi_enumerate_attached_devices(LSILOGIC_SAS_BIOS_IO_PORT);
@@ -638 +638 @@
     else
     {
-        DBG_SCSI("scsi_init: LSI Logic SAS adapter not detected\n");
+        DBG_SCSI("%s: LSI Logic SAS adapter not detected\n", __func__);
     }
 }