儲存庫 vbox 的更動 12630

時間撮記:

2008-9-22 上午09:31:52 (16 年 以前)

作者:

vboxsync

訊息:

SCSI: Add write support for the BIOS (Grub makes use of it if there is a savedefault command in the config)

位置:

trunk/src/VBox/Devices

檔案:

• PC/BIOS/rombios.c (修改) (2 筆差異)
• testcase/Makefile.kmk (修改) (1 筆差異)
• testcase/tstDeviceStructSizeGC.cpp (修改) (2 筆差異)

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

@@ -5512 +5512 @@
 #ifdef VBOX_WITH_SCSI
         if (VBOX_IS_SCSI_DEVICE(device))
-          BX_PANIC("Write to scsi devices not supported\n");
+          status=scsi_write_sectors(VBOX_GET_SCSI_DEVICE(device), count, lba, segment, offset);
         else
 #endif
@@ -5667 +5667 @@
 #ifdef VBOX_WITH_SCSI
         if (VBOX_IS_SCSI_DEVICE(device))
-          BX_PANIC("Writes not supported for SCSI devices\n");
+          status=scsi_write_sectors(VBOX_GET_SCSI_DEVICE(device), count, lba, segment, offset);
         else
 #endif

trunk/src/VBox/Devices/testcase/Makefile.kmk

@@ -64 +64 @@
 tstDeviceStructSizeGC_DEFS     += VBOX_WITH_BUSLOGIC
 endif
+ifdef VBOX_WITH_SCSI
+tstDeviceStructSizeGC_DEFS     += VBOX_WITH_SCSI
+endif
 tstDeviceStructSizeGC_SOURCES   = tstDeviceStructSizeGC.cpp
 tstDeviceStructSizeGC_INCS      = \

trunk/src/VBox/Devices/testcase/tstDeviceStructSizeGC.cpp

@@ -1112 +1112 @@
 #endif /* VBOX_WITH_E1000 */
 
+#ifdef VBOX_WITH_SCSI
+    GEN_CHECK_SIZE(VBOXSCSI);
+    GEN_CHECK_OFF(VBOXSCSI, regIdentify);
+    GEN_CHECK_OFF(VBOXSCSI, uTargetDevice);
+    GEN_CHECK_OFF(VBOXSCSI, uTxDir);
+    GEN_CHECK_OFF(VBOXSCSI, cbCDB);
+    GEN_CHECK_OFF(VBOXSCSI, aCDB);
+    GEN_CHECK_OFF(VBOXSCSI, aCDB[11]);
+    GEN_CHECK_OFF(VBOXSCSI, iCDB);
+    GEN_CHECK_OFF(VBOXSCSI, pBuf);
+    GEN_CHECK_OFF(VBOXSCSI, cbBuf);
+    GEN_CHECK_OFF(VBOXSCSI, iBuf);
+    GEN_CHECK_OFF(VBOXSCSI, fBusy);
+    GEN_CHECK_OFF(VBOXSCSI, enmState);
+#endif
+
 #ifdef VBOX_WITH_BUSLOGIC
     GEN_CHECK_SIZE(BUSLOGICDEVICE);
@@ -1160 +1176 @@
     GEN_CHECK_OFF(BUSLOGIC, pNotifierQueueRC);
     GEN_CHECK_OFF(BUSLOGIC, pTaskCache);
+    GEN_CHECK_OFF(BUSLOGIC, VBoxSCSI);
     GEN_CHECK_OFF(BUSLOGIC, aDeviceStates);
     GEN_CHECK_OFF(BUSLOGIC, aDeviceStates[BUSLOGIC_MAX_DEVICES]);