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

Timestamp:

May 20, 2021 9:53:57 AM (4 years ago)

Author:

vboxsync

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

144539

Message:

Devices/Storage/VBoxSCSI,Devices/testcase: Remove the old VBoxSCSI interface, bugref:4841

Location:

trunk/src/VBox/Devices

Files:

• Storage/VBoxSCSI.cpp (deleted)
• Storage/VBoxSCSI.h (modified) (1 diff)
• testcase/tstDeviceStructSizeRC.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Storage/VBoxSCSI.h

@@ -72 +72 @@
 *   Header Files                                                               *
 *******************************************************************************/
-//#define DEBUG
-#include <iprt/semaphore.h>
 #include <VBox/vmm/pdmdev.h>
-#include <VBox/vmm/pdmstorageifs.h>
-#include <VBox/scsi.h>
 #include <VBox/version.h>
-
-typedef enum VBOXSCSISTATE
-{
-    VBOXSCSISTATE_NO_COMMAND            = 0x00,
-    VBOXSCSISTATE_READ_TXDIR            = 0x01,
-    VBOXSCSISTATE_READ_CDB_SIZE_BUFHI   = 0x02,
-    VBOXSCSISTATE_READ_BUFFER_SIZE_LSB  = 0x03,
-    VBOXSCSISTATE_READ_BUFFER_SIZE_MID  = 0x04,
-    VBOXSCSISTATE_READ_COMMAND          = 0x05,
-    VBOXSCSISTATE_COMMAND_READY         = 0x06
-} VBOXSCSISTATE;
-
-#define VBOXSCSI_TXDIR_FROM_DEVICE 0
-#define VBOXSCSI_TXDIR_TO_DEVICE   1
-
-/** Maximum CDB size the BIOS driver sends. */
-#define VBOXSCSI_CDB_SIZE_MAX     16
-
-typedef struct VBOXSCSI
-{
-    /** The identify register. */
-    uint8_t              regIdentify;
-    /** The target device. */
-    uint8_t              uTargetDevice;
-    /** Transfer direction. */
-    uint8_t              uTxDir;
-    /** The size of the CDB we are issuing. */
-    uint8_t              cbCDB;
-    /** The command to issue. */
-    uint8_t              abCDB[VBOXSCSI_CDB_SIZE_MAX + 4];
-    /** Current position in the array. */
-    uint8_t              iCDB;
-
-#if HC_ARCH_BITS == 64
-    uint32_t             Alignment0;
-#endif
-
-    /** Pointer to the buffer holding the data. */
-    R3PTRTYPE(uint8_t *) pbBuf;
-    /** Size of the buffer in bytes. */
-    uint32_t             cbBuf;
-    /** The number of bytes left to read/write in the
-     *  buffer.  It is decremented when the guest (BIOS) accesses
-     *  the buffer data. */
-    uint32_t             cbBufLeft;
-    /** Current position in the buffer (offBuf if you like). */
-    uint32_t             iBuf;
-    /** The result code of last operation. */
-    int32_t              rcCompletion;
-    /** Flag whether a request is pending. */
-    volatile bool        fBusy;
-    /** The state we are in when fetching a command from the BIOS. */
-    VBOXSCSISTATE        enmState;
-    /** Critical section protecting the device state. */
-    RTCRITSECT           CritSect;
-} VBOXSCSI, *PVBOXSCSI;
-
-#define VBOX_SCSI_BUSY  RT_BIT(0)
-#define VBOX_SCSI_ERROR RT_BIT(1)
 
 #ifdef IN_RING3
 RT_C_DECLS_BEGIN
-int vboxscsiInitialize(PVBOXSCSI pVBoxSCSI);
-void vboxscsiDestroy(PVBOXSCSI pVBoxSCSI);
-void vboxscsiHwReset(PVBOXSCSI pVBoxSCSI);
-int vboxscsiReadRegister(PVBOXSCSI pVBoxSCSI, uint8_t iRegister, uint32_t *pu32Value);
-int vboxscsiWriteRegister(PVBOXSCSI pVBoxSCSI, uint8_t iRegister, uint8_t uVal);
-int vboxscsiSetupRequest(PVBOXSCSI pVBoxSCSI, uint32_t *puLun, uint8_t **ppbCdb, size_t *pcbCdb,
-                         size_t *pcbBuf, uint32_t *puTargetDevice);
-int vboxscsiRequestFinished(PVBOXSCSI pVBoxSCSI, int rcCompletion);
-size_t vboxscsiCopyToBuf(PVBOXSCSI pVBoxSCSI, PRTSGBUF pSgBuf, size_t cbSkip, size_t cbCopy);
-size_t vboxscsiCopyFromBuf(PVBOXSCSI pVBoxSCSI, PRTSGBUF pSgBuf, size_t cbSkip, size_t cbCopy);
-void vboxscsiSetRequestRedo(PVBOXSCSI pVBoxSCSI);
-int vboxscsiWriteString(PPDMDEVINS pDevIns, PVBOXSCSI pVBoxSCSI, uint8_t iRegister,
-                        uint8_t const *pbSrc, uint32_t *pcTransfers, unsigned cb);
-int vboxscsiReadString(PPDMDEVINS pDevIns, PVBOXSCSI pVBoxSCSI, uint8_t iRegister,
-                       uint8_t *pbDst, uint32_t *pcTransfers, unsigned cb);
-
-DECLHIDDEN(int) vboxscsiR3LoadExec(PCPDMDEVHLPR3 pHlp, PVBOXSCSI pVBoxSCSI, PSSMHANDLE pSSM);
-DECLHIDDEN(int) vboxscsiR3SaveExec(PCPDMDEVHLPR3 pHlp, PVBOXSCSI pVBoxSCSI, PSSMHANDLE pSSM);
 
 /**

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

@@ -1602 +1602 @@
 #endif /* VBOX_WITH_VIRTIO */
 
-#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, abCDB);
-    GEN_CHECK_OFF(VBOXSCSI, abCDB[11]);
-    GEN_CHECK_OFF(VBOXSCSI, iCDB);
-    GEN_CHECK_OFF(VBOXSCSI, pbBuf);
-    GEN_CHECK_OFF(VBOXSCSI, cbBuf);
-    GEN_CHECK_OFF(VBOXSCSI, iBuf);
-    GEN_CHECK_OFF(VBOXSCSI, fBusy);
-    GEN_CHECK_OFF(VBOXSCSI, enmState);
-#endif
-
     /* VMMDev*.cpp/h */
     GEN_CHECK_SIZE(VMMDEV);