Changeset 40640 in vbox for trunk/src/VBox/Devices/PC

Timestamp:

Mar 26, 2012 12:55:17 PM (13 years ago)

Author:

vboxsync

Message:

Renamed SCSI BIOS constants to elucidate their purpose.

Location:

trunk/src/VBox/Devices/PC

Files:

• BIOS-new/scsi.c (modified) (7 diffs)
• BIOS/scsi.c (modified) (9 diffs)

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

@@ -34 +34 @@
 
 /* The I/O port of the BusLogic SCSI adapter. */
-#define BUSLOGIC_ISA_IO_PORT 0x330
+#define BUSLOGIC_BIOS_IO_PORT       0x330
 /* The I/O port of the LsiLogic SCSI adapter. */
-#define LSILOGIC_ISA_IO_PORT 0x340
+#define LSILOGIC_BIOS_IO_PORT       0x340
 /* The I/O port of the LsiLogic SAS adapter. */
-#define LSILOGIC_SAS_ISA_IO_PORT 0x350
+#define LSILOGIC_SAS_BIOS_IO_PORT   0x350
 
 #define VBSCSI_REGISTER_STATUS   0
@@ -399 +399 @@
 
     /* Detect BusLogic adapter. */
-    outb(BUSLOGIC_ISA_IO_PORT+VBSCSI_REGISTER_IDENTIFY, 0x55);
-    identifier = inb(BUSLOGIC_ISA_IO_PORT+VBSCSI_REGISTER_IDENTIFY);
+    outb(BUSLOGIC_BIOS_IO_PORT+VBSCSI_REGISTER_IDENTIFY, 0x55);
+    identifier = inb(BUSLOGIC_BIOS_IO_PORT+VBSCSI_REGISTER_IDENTIFY);
 
     if (identifier == 0x55)
@@ -406 +406 @@
         /* Detected - Enumerate attached devices. */
         VBSCSI_DEBUG("scsi_init: BusLogic SCSI adapter detected\n");
-        outb(BUSLOGIC_ISA_IO_PORT+VBSCSI_REGISTER_RESET, 0);
-        scsi_enumerate_attached_devices(BUSLOGIC_ISA_IO_PORT);
+        outb(BUSLOGIC_BIOS_IO_PORT+VBSCSI_REGISTER_RESET, 0);
+        scsi_enumerate_attached_devices(BUSLOGIC_BIOS_IO_PORT);
     }
     else
@@ -415 +415 @@
 
     /* Detect LsiLogic adapter. */
-    outb(LSILOGIC_ISA_IO_PORT+VBSCSI_REGISTER_IDENTIFY, 0x55);
-    identifier = inb(LSILOGIC_ISA_IO_PORT+VBSCSI_REGISTER_IDENTIFY);
+    outb(LSILOGIC_BIOS_IO_PORT+VBSCSI_REGISTER_IDENTIFY, 0x55);
+    identifier = inb(LSILOGIC_BIOS_IO_PORT+VBSCSI_REGISTER_IDENTIFY);
 
     if (identifier == 0x55)
@@ -422 +422 @@
         /* Detected - Enumerate attached devices. */
         VBSCSI_DEBUG("scsi_init: LSI Logic SCSI adapter detected\n");
-        outb(LSILOGIC_ISA_IO_PORT+VBSCSI_REGISTER_RESET, 0);
-        scsi_enumerate_attached_devices(LSILOGIC_ISA_IO_PORT);
+        outb(LSILOGIC_BIOS_IO_PORT+VBSCSI_REGISTER_RESET, 0);
+        scsi_enumerate_attached_devices(LSILOGIC_BIOS_IO_PORT);
     }
     else
@@ -431 +431 @@
 
     /* Detect LsiLogic SAS adapter. */
-    outb(LSILOGIC_SAS_ISA_IO_PORT+VBSCSI_REGISTER_IDENTIFY, 0x55);
-    identifier = inb(LSILOGIC_SAS_ISA_IO_PORT+VBSCSI_REGISTER_IDENTIFY);
+    outb(LSILOGIC_SAS_BIOS_IO_PORT+VBSCSI_REGISTER_IDENTIFY, 0x55);
+    identifier = inb(LSILOGIC_SAS_BIOS_IO_PORT+VBSCSI_REGISTER_IDENTIFY);
 
     if (identifier == 0x55)
@@ -438 +438 @@
         /* Detected - Enumerate attached devices. */
         VBSCSI_DEBUG("scsi_init: LSI Logic SAS adapter detected\n");
-        outb(LSILOGIC_SAS_ISA_IO_PORT+VBSCSI_REGISTER_RESET, 0);
-        scsi_enumerate_attached_devices(LSILOGIC_SAS_ISA_IO_PORT);
+        outb(LSILOGIC_SAS_BIOS_IO_PORT+VBSCSI_REGISTER_RESET, 0);
+        scsi_enumerate_attached_devices(LSILOGIC_SAS_BIOS_IO_PORT);
     }
     else

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

@@ -17 +17 @@
 
 /* The I/O port of the BusLogic SCSI adapter. */
-#define BUSLOGIC_ISA_IO_PORT 0x330
+#define BUSLOGIC_BIOS_IO_PORT       0x330
 /* The I/O port of the LsiLogic SCSI adapter. */
-#define LSILOGIC_ISA_IO_PORT 0x340
+#define LSILOGIC_BIOS_IO_PORT       0x340
 /* The I/O port of the LsiLogic SAS adapter. */
-#define LSILOGIC_SAS_ISA_IO_PORT 0x350
+#define LSILOGIC_SAS_BIOS_IO_PORT   0x350
 
 #define VBOXSCSI_REGISTER_STATUS   0
@@ -367 +367 @@
 
                 /* We need to calculate the geometry for the disk. */
-                if (io_base == BUSLOGIC_ISA_IO_PORT)
+                if (io_base == BUSLOGIC_BIOS_IO_PORT)
                 {
                     /* This is from the BusLogic driver in the Linux kernel. */
@@ -387 +387 @@
                     cylinders = (uint32_t)(sectors / (heads * sectors_per_track));
                 }
-                else if (io_base == LSILOGIC_ISA_IO_PORT || io_base == LSILOGIC_SAS_ISA_IO_PORT)
+                else if (io_base == LSILOGIC_BIOS_IO_PORT || io_base == LSILOGIC_SAS_BIOS_IO_PORT)
                 {
                     /* This is from the BusLogic driver in the Linux kernel. */
@@ -477 +477 @@
 
     /* Detect BusLogic adapter. */
-    outb(BUSLOGIC_ISA_IO_PORT+VBOXSCSI_REGISTER_IDENTIFY, 0x55);
-    identifier = inb(BUSLOGIC_ISA_IO_PORT+VBOXSCSI_REGISTER_IDENTIFY);
+    outb(BUSLOGIC_BIOS_IO_PORT+VBOXSCSI_REGISTER_IDENTIFY, 0x55);
+    identifier = inb(BUSLOGIC_BIOS_IO_PORT+VBOXSCSI_REGISTER_IDENTIFY);
 
     if (identifier == 0x55)
@@ -484 +484 @@
         /* Detected - Enumerate attached devices. */
         VBOXSCSI_DEBUG("scsi_init: BusLogic SCSI adapter detected\n");
-        outb(BUSLOGIC_ISA_IO_PORT+VBOXSCSI_REGISTER_RESET, 0);
-        scsi_enumerate_attached_devices(BUSLOGIC_ISA_IO_PORT);
+        outb(BUSLOGIC_BIOS_IO_PORT+VBOXSCSI_REGISTER_RESET, 0);
+        scsi_enumerate_attached_devices(BUSLOGIC_BIOS_IO_PORT);
     }
     else
@@ -493 +493 @@
 
     /* Detect LsiLogic adapter. */
-    outb(LSILOGIC_ISA_IO_PORT+VBOXSCSI_REGISTER_IDENTIFY, 0x55);
-    identifier = inb(LSILOGIC_ISA_IO_PORT+VBOXSCSI_REGISTER_IDENTIFY);
+    outb(LSILOGIC_BIOS_IO_PORT+VBOXSCSI_REGISTER_IDENTIFY, 0x55);
+    identifier = inb(LSILOGIC_BIOS_IO_PORT+VBOXSCSI_REGISTER_IDENTIFY);
 
     if (identifier == 0x55)
@@ -500 +500 @@
         /* Detected - Enumerate attached devices. */
         VBOXSCSI_DEBUG("scsi_init: LsiLogic SCSI adapter detected\n");
-        outb(LSILOGIC_ISA_IO_PORT+VBOXSCSI_REGISTER_RESET, 0);
-        scsi_enumerate_attached_devices(LSILOGIC_ISA_IO_PORT);
+        outb(LSILOGIC_BIOS_IO_PORT+VBOXSCSI_REGISTER_RESET, 0);
+        scsi_enumerate_attached_devices(LSILOGIC_BIOS_IO_PORT);
     }
     else
@@ -509 +509 @@
 
     /* Detect LsiLogic SAS adapter. */
-    outb(LSILOGIC_SAS_ISA_IO_PORT+VBOXSCSI_REGISTER_IDENTIFY, 0x55);
-    identifier = inb(LSILOGIC_SAS_ISA_IO_PORT+VBOXSCSI_REGISTER_IDENTIFY);
+    outb(LSILOGIC_SAS_BIOS_IO_PORT+VBOXSCSI_REGISTER_IDENTIFY, 0x55);
+    identifier = inb(LSILOGIC_SAS_BIOS_IO_PORT+VBOXSCSI_REGISTER_IDENTIFY);
 
     if (identifier == 0x55)
@@ -516 +516 @@
         /* Detected - Enumerate attached devices. */
         VBOXSCSI_DEBUG("scsi_init: LsiLogic SAS adapter detected\n");
-        outb(LSILOGIC_SAS_ISA_IO_PORT+VBOXSCSI_REGISTER_RESET, 0);
-        scsi_enumerate_attached_devices(LSILOGIC_SAS_ISA_IO_PORT);
+        outb(LSILOGIC_SAS_BIOS_IO_PORT+VBOXSCSI_REGISTER_RESET, 0);
+        scsi_enumerate_attached_devices(LSILOGIC_SAS_BIOS_IO_PORT);
     }
     else