VirtualBox

Changeset 44533 in vbox


Ignore:
Timestamp:
Feb 4, 2013 8:55:12 PM (12 years ago)
Author:
vboxsync
Message:

VBoxSVSI.cpp: doxygen and hungarian adjustments.

Location:
trunk/src/VBox
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Devices/Storage/DevBusLogic.cpp

    r44532 r44533  
    797797    unsigned char uLegacyQueueTag : 2;
    798798    /** The SCSI CDB.  (A CDB can be 12 bytes long.) */
    799     uint8_t       aCDB[12];
     799    uint8_t       abCDB[12];
    800800    /** Reserved. */
    801801    uint8_t       uReserved3[6];
    … …  
    840840    uint8_t         aReserved[2];
    841841    /** The SCSI CDB.  (A CDB can be 12 bytes long.)   */
    842     uint8_t         aCDB[12];
     842    uint8_t         abCDB[12];
    843843} CCB24, *PCCB24;
    844844AssertCompileSize(CCB24, 30);
    … …  
    869869    uint8_t         aPad2[2];
    870870    /** The SCSI CDB (up to 12 bytes). */
    871     uint8_t         aCDB[12];
     871    uint8_t         abCDB[12];
    872872} CCBC, *PCCBC;
    873873AssertCompileSize(CCB24, 30);
    … …  
    880880AssertCompileMemberOffset(CCB24, uHostAdapterStatus, 14);
    881881AssertCompileMemberOffset(CCB32, uHostAdapterStatus, 14);
    882 AssertCompileMemberOffset(CCBC,  aCDB, 18);
    883 AssertCompileMemberOffset(CCB24, aCDB, 18);
    884 AssertCompileMemberOffset(CCB32, aCDB, 18);
     882AssertCompileMemberOffset(CCBC,  abCDB, 18);
     883AssertCompileMemberOffset(CCB24, abCDB, 18);
     884AssertCompileMemberOffset(CCB32, abCDB, 18);
    885885
    886886/** A union of all CCB types (24-bit/32-bit/common). */
    … …  
    930930    uint8_t         cbCDB;
    931931    /** The SCSI CDB.  (A CDB can be 12 bytes long.)   */
    932     uint8_t         aCDB[12];
     932    uint8_t         abCDB[12];
    933933} ESCMD, *PESCMD;
    934934AssertCompileSize(ESCMD, 24);
    … …  
    12861286        Log(("%s: PhysAddrSenseData=%#x\n", __FUNCTION__, pCCB->n.u32PhysAddrSenseData));
    12871287    }
    1288     Log(("%s: uCDB[0]=%#x\n", __FUNCTION__, pCCB->c.aCDB[0]));
     1288    Log(("%s: uCDB[0]=%#x\n", __FUNCTION__, pCCB->c.abCDB[0]));
    12891289    for (int i = 1; i < pCCB->c.cbCDB; i++)
    1290         Log(("%s: uCDB[%d]=%u\n", __FUNCTION__, i, pCCB->c.aCDB[i]));
     1290        Log(("%s: uCDB[%d]=%u\n", __FUNCTION__, i, pCCB->c.abCDB[i]));
    12911291}
    12921292
    … …  
    14931493     * returns no data, hence the buffer must be left alone!
    14941494     */
    1495     if (pTaskState->CommandControlBlockGuest.c.aCDB[0] == 0)
     1495    if (pTaskState->CommandControlBlockGuest.c.abCDB[0] == 0)
    14961496        cbDataCCB = 0;
    14971497#endif
    … …  
    16211621        {           
    16221622            GCPhysAddrSenseBuffer  = pTaskState->MailboxGuest.u32PhysAddrCCB;
    1623             GCPhysAddrSenseBuffer += pTaskState->CommandControlBlockGuest.c.cbCDB + RT_OFFSETOF(CCB24, aCDB);
     1623            GCPhysAddrSenseBuffer += pTaskState->CommandControlBlockGuest.c.cbCDB + RT_OFFSETOF(CCB24, abCDB);
    16241624        }
    16251625        else
    … …  
    24012401        ScsiInquiryData.u3PeripheralQualifier = SCSI_INQUIRY_DATA_PERIPHERAL_QUALIFIER_NOT_CONNECTED_NOT_SUPPORTED;
    24022402
    2403         memcpy(pBusLogic->VBoxSCSI.pBuf, &ScsiInquiryData, 5);
     2403        memcpy(pBusLogic->VBoxSCSI.pbBuf, &ScsiInquiryData, 5);
    24042404
    24052405        rc = vboxscsiRequestFinished(&pBusLogic->VBoxSCSI, &pTaskState->PDMScsiRequest, SCSI_STATUS_OK);
    … …  
    28552855
    28562856        pTaskState->PDMScsiRequest.cbCDB                 = pTaskState->CommandControlBlockGuest.c.cbCDB;
    2857         pTaskState->PDMScsiRequest.pbCDB                 = pTaskState->CommandControlBlockGuest.c.aCDB;
     2857        pTaskState->PDMScsiRequest.pbCDB                 = pTaskState->CommandControlBlockGuest.c.abCDB;
    28582858        if (pTaskState->DataSeg.cbSeg)
    28592859        {
    … …  
    31163116    SSMR3PutU8    (pSSM, pBusLogic->VBoxSCSI.uTxDir);
    31173117    SSMR3PutU8    (pSSM, pBusLogic->VBoxSCSI.cbCDB);
    3118     SSMR3PutMem   (pSSM, pBusLogic->VBoxSCSI.aCDB, sizeof(pBusLogic->VBoxSCSI.aCDB));
     3118    SSMR3PutMem   (pSSM, pBusLogic->VBoxSCSI.abCDB, sizeof(pBusLogic->VBoxSCSI.abCDB));
    31193119    SSMR3PutU8    (pSSM, pBusLogic->VBoxSCSI.iCDB);
    31203120    SSMR3PutU32   (pSSM, pBusLogic->VBoxSCSI.cbBuf);
    … …  
    31233123    SSMR3PutU8    (pSSM, pBusLogic->VBoxSCSI.enmState);
    31243124    if (pBusLogic->VBoxSCSI.cbBuf)
    3125         SSMR3PutMem(pSSM, pBusLogic->VBoxSCSI.pBuf, pBusLogic->VBoxSCSI.cbBuf);
     3125        SSMR3PutMem(pSSM, pBusLogic->VBoxSCSI.pbBuf, pBusLogic->VBoxSCSI.cbBuf);
    31263126
    31273127    /*
    … …  
    32263226    SSMR3GetU8  (pSSM, &pBusLogic->VBoxSCSI.uTxDir);
    32273227    SSMR3GetU8  (pSSM, &pBusLogic->VBoxSCSI.cbCDB);
    3228     SSMR3GetMem (pSSM, pBusLogic->VBoxSCSI.aCDB, sizeof(pBusLogic->VBoxSCSI.aCDB));
     3228    SSMR3GetMem (pSSM, pBusLogic->VBoxSCSI.abCDB, sizeof(pBusLogic->VBoxSCSI.abCDB));
    32293229    SSMR3GetU8  (pSSM, &pBusLogic->VBoxSCSI.iCDB);
    32303230    SSMR3GetU32 (pSSM, &pBusLogic->VBoxSCSI.cbBuf);
    … …  
    32343234    if (pBusLogic->VBoxSCSI.cbBuf)
    32353235    {
    3236         pBusLogic->VBoxSCSI.pBuf = (uint8_t *)RTMemAllocZ(pBusLogic->VBoxSCSI.cbBuf);
    3237         if (!pBusLogic->VBoxSCSI.pBuf)
     3236        pBusLogic->VBoxSCSI.pbBuf = (uint8_t *)RTMemAllocZ(pBusLogic->VBoxSCSI.cbBuf);
     3237        if (!pBusLogic->VBoxSCSI.pbBuf)
    32383238        {
    32393239            LogRel(("BusLogic: Out of memory during restore.\n"));
    … …  
    32413241                                    N_("BusLogic: Out of memory during restore\n"));
    32423242        }
    3243         SSMR3GetMem(pSSM, pBusLogic->VBoxSCSI.pBuf, pBusLogic->VBoxSCSI.cbBuf);
     3243        SSMR3GetMem(pSSM, pBusLogic->VBoxSCSI.pbBuf, pBusLogic->VBoxSCSI.cbBuf);
    32443244    }
    32453245

  • trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp

    r43665 r44533  
    37263726    ScsiInquiryData.u3PeripheralQualifier = SCSI_INQUIRY_DATA_PERIPHERAL_QUALIFIER_NOT_CONNECTED_NOT_SUPPORTED;
    37273727
    3728     memcpy(pLsiLogic->VBoxSCSI.pBuf, &ScsiInquiryData, 5);
     3728    memcpy(pLsiLogic->VBoxSCSI.pbBuf, &ScsiInquiryData, 5);
    37293729
    37303730    rc = vboxscsiRequestFinished(&pLsiLogic->VBoxSCSI, &pTaskState->PDMScsiRequest, SCSI_STATUS_OK);
    … …  
    42544254    SSMR3PutU8    (pSSM, pLsiLogic->VBoxSCSI.uTxDir);
    42554255    SSMR3PutU8    (pSSM, pLsiLogic->VBoxSCSI.cbCDB);
    4256     SSMR3PutMem   (pSSM, pLsiLogic->VBoxSCSI.aCDB, sizeof(pLsiLogic->VBoxSCSI.aCDB));
     4256    SSMR3PutMem   (pSSM, pLsiLogic->VBoxSCSI.abCDB, sizeof(pLsiLogic->VBoxSCSI.abCDB));
    42574257    SSMR3PutU8    (pSSM, pLsiLogic->VBoxSCSI.iCDB);
    42584258    SSMR3PutU32   (pSSM, pLsiLogic->VBoxSCSI.cbBuf);
    … …  
    42614261    SSMR3PutU8    (pSSM, pLsiLogic->VBoxSCSI.enmState);
    42624262    if (pLsiLogic->VBoxSCSI.cbBuf)
    4263         SSMR3PutMem(pSSM, pLsiLogic->VBoxSCSI.pBuf, pLsiLogic->VBoxSCSI.cbBuf);
     4263        SSMR3PutMem(pSSM, pLsiLogic->VBoxSCSI.pbBuf, pLsiLogic->VBoxSCSI.cbBuf);
    42644264
    42654265    return SSMR3PutU32(pSSM, ~0);
    … …  
    45364536    SSMR3GetU8  (pSSM, &pLsiLogic->VBoxSCSI.uTxDir);
    45374537    SSMR3GetU8  (pSSM, &pLsiLogic->VBoxSCSI.cbCDB);
    4538     SSMR3GetMem (pSSM, pLsiLogic->VBoxSCSI.aCDB, sizeof(pLsiLogic->VBoxSCSI.aCDB));
     4538    SSMR3GetMem (pSSM, pLsiLogic->VBoxSCSI.abCDB, sizeof(pLsiLogic->VBoxSCSI.abCDB));
    45394539    SSMR3GetU8  (pSSM, &pLsiLogic->VBoxSCSI.iCDB);
    45404540    SSMR3GetU32 (pSSM, &pLsiLogic->VBoxSCSI.cbBuf);
    … …  
    45444544    if (pLsiLogic->VBoxSCSI.cbBuf)
    45454545    {
    4546         pLsiLogic->VBoxSCSI.pBuf = (uint8_t *)RTMemAllocZ(pLsiLogic->VBoxSCSI.cbBuf);
    4547         if (!pLsiLogic->VBoxSCSI.pBuf)
     4546        pLsiLogic->VBoxSCSI.pbBuf = (uint8_t *)RTMemAllocZ(pLsiLogic->VBoxSCSI.cbBuf);
     4547        if (!pLsiLogic->VBoxSCSI.pbBuf)
    45484548        {
    45494549            LogRel(("LsiLogic: Out of memory during restore.\n"));
    … …  
    45514551                                    N_("LsiLogic: Out of memory during restore\n"));
    45524552        }
    4553         SSMR3GetMem(pSSM, pLsiLogic->VBoxSCSI.pBuf, pLsiLogic->VBoxSCSI.cbBuf);
     4553        SSMR3GetMem(pSSM, pLsiLogic->VBoxSCSI.pbBuf, pLsiLogic->VBoxSCSI.cbBuf);
    45544554    }
    45554555

  • trunk/src/VBox/Devices/Storage/VBoxSCSI.cpp

    r44528 r44533  
    11/* $Id$ */
    22/** @file
    3  *
    4  * VBox storage devices:
    5  * Simple SCSI interface for BIOS access
     3 * VBox storage devices - Simple SCSI interface for BIOS access.
    64 */
    75
    86/*
    9  * Copyright (C) 2006-2012 Oracle Corporation
     7 * Copyright (C) 2006-2013 Oracle Corporation
    108 *
    119 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    2220*******************************************************************************/
    2321//#define DEBUG
    24 #define LOG_GROUP LOG_GROUP_DEV_BUSLOGIC /* @todo: Create extra group. */
     22#define LOG_GROUP LOG_GROUP_DEV_BUSLOGIC /** @todo Create extra group. */
    2523
    2624#if defined(IN_R0) || defined(IN_RC)
    27 # error This device has no R0 or GC components
     25# error This device has no R0 or RC components
    2826#endif
    2927
    … …  
    3735#include "VBoxSCSI.h"
    3836
     37
     38/**
     39 * Resets the state.
     40 */
    3941static void vboxscsiReset(PVBOXSCSI pVBoxSCSI)
    4042{
    4143    pVBoxSCSI->regIdentify   = 0;
    4244    pVBoxSCSI->cbCDB         = 0;
    43     memset(pVBoxSCSI->aCDB, 0, sizeof(pVBoxSCSI->aCDB));
     45    memset(pVBoxSCSI->abCDB, 0, sizeof(pVBoxSCSI->abCDB));
    4446    pVBoxSCSI->iCDB          = 0;
    4547    pVBoxSCSI->fBusy         = false;
    … …  
    4850    pVBoxSCSI->cbBuf         = 0;
    4951    pVBoxSCSI->iBuf          = 0;
    50     if (pVBoxSCSI->pBuf)
    51         RTMemFree(pVBoxSCSI->pBuf);
    52 
    53     pVBoxSCSI->pBuf          = NULL;
     52    if (pVBoxSCSI->pbBuf)
     53        RTMemFree(pVBoxSCSI->pbBuf);
     54
     55    pVBoxSCSI->pbBuf         = NULL;
    5456    pVBoxSCSI->enmState      = VBOXSCSISTATE_NO_COMMAND;
    5557}
    … …  
    6365int vboxscsiInitialize(PVBOXSCSI pVBoxSCSI)
    6466{
    65     pVBoxSCSI->pBuf        = NULL;
     67    pVBoxSCSI->pbBuf = NULL;
    6668    vboxscsiReset(pVBoxSCSI);
    6769
    … …  
    102104            if ((pVBoxSCSI->enmState == VBOXSCSISTATE_COMMAND_READY) && pVBoxSCSI->cbBuf > 0)
    103105            {
    104                 AssertMsg(pVBoxSCSI->pBuf, ("pBuf is NULL\n"));
     106                AssertMsg(pVBoxSCSI->pbBuf, ("pBuf is NULL\n"));
    105107                Assert(pVBoxSCSI->enmState == VBOXSCSISTATE_COMMAND_READY);
    106108                Assert(!pVBoxSCSI->fBusy);
    107                 uVal = pVBoxSCSI->pBuf[pVBoxSCSI->iBuf];
     109                uVal = pVBoxSCSI->pbBuf[pVBoxSCSI->iBuf];
    108110                pVBoxSCSI->iBuf++;
    109111                pVBoxSCSI->cbBuf--;
    … …  
    113115                     *  Clear everything and reset command buffer.
    114116                     */
    115                     RTMemFree(pVBoxSCSI->pBuf);
    116                     pVBoxSCSI->pBuf = NULL;
     117                    RTMemFree(pVBoxSCSI->pbBuf);
     118                    pVBoxSCSI->pbBuf = NULL;
    117119                    pVBoxSCSI->cbCDB = 0;
    118120                    pVBoxSCSI->iCDB  = 0;
    … …  
    121123                    pVBoxSCSI->uTargetDevice = 0;
    122124                    pVBoxSCSI->enmState = VBOXSCSISTATE_NO_COMMAND;
    123                     memset(pVBoxSCSI->aCDB, 0, sizeof(pVBoxSCSI->aCDB));
     125                    memset(pVBoxSCSI->abCDB, 0, sizeof(pVBoxSCSI->abCDB));
    124126                }
    125127            }
    … …  
    202204            else if (pVBoxSCSI->enmState == VBOXSCSISTATE_READ_COMMAND)
    203205            {
    204                 pVBoxSCSI->aCDB[pVBoxSCSI->iCDB] = uVal;
     206                pVBoxSCSI->abCDB[pVBoxSCSI->iCDB] = uVal;
    205207                pVBoxSCSI->iCDB++;
    206208
    … …  
    213215                    {
    214216                        /* This is a write allocate buffer. */
    215                         pVBoxSCSI->pBuf = (uint8_t *)RTMemAllocZ(pVBoxSCSI->cbBuf);
    216                         if (!pVBoxSCSI->pBuf)
     217                        pVBoxSCSI->pbBuf = (uint8_t *)RTMemAllocZ(pVBoxSCSI->cbBuf);
     218                        if (!pVBoxSCSI->pbBuf)
    217219                            return VERR_NO_MEMORY;
    218220                    }
    … …  
    239241            else
    240242            {
    241                 pVBoxSCSI->pBuf[pVBoxSCSI->iBuf++] = uVal;
     243                pVBoxSCSI->pbBuf[pVBoxSCSI->iBuf++] = uVal;
    242244                if (pVBoxSCSI->iBuf == pVBoxSCSI->cbBuf)
    243245                {
    … …  
    287289    if (pVBoxSCSI->uTxDir == VBOXSCSI_TXDIR_FROM_DEVICE)
    288290    {
    289         if (pVBoxSCSI->pBuf)
    290             RTMemFree(pVBoxSCSI->pBuf);
    291 
    292         pVBoxSCSI->pBuf = (uint8_t *)RTMemAllocZ(pVBoxSCSI->cbBuf);
    293         if (!pVBoxSCSI->pBuf)
     291        if (pVBoxSCSI->pbBuf)
     292            RTMemFree(pVBoxSCSI->pbBuf);
     293
     294        pVBoxSCSI->pbBuf = (uint8_t *)RTMemAllocZ(pVBoxSCSI->cbBuf);
     295        if (!pVBoxSCSI->pbBuf)
    294296            return VERR_NO_MEMORY;
    295297    }
    … …  
    299301    if (!pScsiRequest->paScatterGatherHead)
    300302    {
    301         RTMemFree(pVBoxSCSI->pBuf);
    302         pVBoxSCSI->pBuf = NULL;
     303        RTMemFree(pVBoxSCSI->pbBuf);
     304        pVBoxSCSI->pbBuf = NULL;
    303305        return VERR_NO_MEMORY;
    304306    }
    … …  
    309311
    310312    pScsiRequest->cbCDB = pVBoxSCSI->cbCDB;
    311     pScsiRequest->pbCDB = pVBoxSCSI->aCDB;
     313    pScsiRequest->pbCDB = pVBoxSCSI->abCDB;
    312314    pScsiRequest->uLogicalUnit = 0;
    313315    pScsiRequest->cbScatterGather = pVBoxSCSI->cbBuf;
    … …  
    315317
    316318    pScsiRequest->paScatterGatherHead[0].cbSeg = pVBoxSCSI->cbBuf;
    317     pScsiRequest->paScatterGatherHead[0].pvSeg = pVBoxSCSI->pBuf;
     319    pScsiRequest->paScatterGatherHead[0].pvSeg = pVBoxSCSI->pbBuf;
    318320
    319321    *puTargetDevice = pVBoxSCSI->uTargetDevice;
    … …  
    334336    if (pVBoxSCSI->uTxDir == VBOXSCSI_TXDIR_TO_DEVICE)
    335337    {
    336         if (pVBoxSCSI->pBuf)
    337             RTMemFree(pVBoxSCSI->pBuf);
    338         pVBoxSCSI->pBuf  = NULL;
     338        if (pVBoxSCSI->pbBuf)
     339            RTMemFree(pVBoxSCSI->pbBuf);
     340        pVBoxSCSI->pbBuf  = NULL;
    339341        pVBoxSCSI->cbBuf = 0;
    340342        pVBoxSCSI->cbCDB = 0;
    … …  
    343345        pVBoxSCSI->uTargetDevice = 0;
    344346        pVBoxSCSI->enmState = VBOXSCSISTATE_NO_COMMAND;
    345         memset(pVBoxSCSI->aCDB, 0, sizeof(pVBoxSCSI->aCDB));
     347        memset(pVBoxSCSI->abCDB, 0, sizeof(pVBoxSCSI->abCDB));
    346348    }
    347349
    … …  
    366368
    367369    /* Accesses without a valid buffer will be ignored. */
    368     if (!pVBoxSCSI->pBuf)
     370    if (!pVBoxSCSI->pbBuf)
    369371        return VINF_SUCCESS;
    370372
    … …  
    374376        cbTransfer = pVBoxSCSI->cbBuf;  /* Ignore excess data (not supposed to happen). */
    375377
    376     int rc = PGMPhysSimpleDirtyWriteGCPtr(PDMDevHlpGetVMCPU(pDevIns), GCDst, pVBoxSCSI->pBuf + pVBoxSCSI->iBuf, cbTransfer);
     378    int rc = PGMPhysSimpleDirtyWriteGCPtr(PDMDevHlpGetVMCPU(pDevIns), GCDst, pVBoxSCSI->pbBuf + pVBoxSCSI->iBuf, cbTransfer);
    377379    AssertRC(rc);
    378380
    … …  
    389391         *  Clear everything and reset command buffer.
    390392         */
    391         RTMemFree(pVBoxSCSI->pBuf);
    392         pVBoxSCSI->pBuf  = NULL;
     393        RTMemFree(pVBoxSCSI->pbBuf);
     394        pVBoxSCSI->pbBuf  = NULL;
    393395        pVBoxSCSI->cbCDB = 0;
    394396        pVBoxSCSI->iCDB  = 0;
    … …  
    396398        pVBoxSCSI->uTargetDevice = 0;
    397399        pVBoxSCSI->enmState = VBOXSCSISTATE_NO_COMMAND;
    398         memset(pVBoxSCSI->aCDB, 0, sizeof(pVBoxSCSI->aCDB));
     400        memset(pVBoxSCSI->abCDB, 0, sizeof(pVBoxSCSI->abCDB));
    399401    }
    400402
    … …  
    412414
    413415    /* Accesses without a valid buffer will be ignored. */
    414     if (!pVBoxSCSI->pBuf)
     416    if (!pVBoxSCSI->pbBuf)
    415417        return VINF_SUCCESS;
    416418
    … …  
    419421        cbTransfer = pVBoxSCSI->cbBuf;  /* Ignore excess data (not supposed to happen). */
    420422
    421     int rc = PDMDevHlpPhysReadGCVirt(pDevIns, pVBoxSCSI->pBuf + pVBoxSCSI->iBuf, GCSrc, cbTransfer);
     423    int rc = PDMDevHlpPhysReadGCVirt(pDevIns, pVBoxSCSI->pbBuf + pVBoxSCSI->iBuf, GCSrc, cbTransfer);
    422424    AssertRC(rc);
    423425
    … …  
    442444    if (pVBoxSCSI->uTxDir == VBOXSCSI_TXDIR_FROM_DEVICE)
    443445    {
    444         AssertPtr(pVBoxSCSI->pBuf);
    445     }
    446 }
     446        AssertPtr(pVBoxSCSI->pbBuf);
     447    }
     448}

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

    r44528 r44533  
    11/* $Id$ */
    22/** @file
    3  *
    4  * VBox storage devices:
    5  * Simple SCSI interface for BIOS access
     3 * VBox storage devices - Simple SCSI interface for BIOS access.
    64 */
    75
    … …  
    1816 */
    1917
    20 /**
    21  * This is a simple interface to access SCSI devices from the BIOS
    22  * which is shared between the BusLogic and the LsiLogic
    23  * SCSI host adapters to simplify the BIOS part.
     18/** @page pg_drv_scsi   Simple SCSI interface for BIOS access.
    2419 *
    25  * The BusLogic interface if available will be starting at port 0x330
    26  * and the LsiLogic starts at 0x340 and each will have a size of 4 ports.
    27  * The ports are used as described below:
     20 * This is a simple interface to access SCSI devices from the BIOS which is
     21 * shared between the BusLogic and the LsiLogic SCSI host adapters to simplify
     22 * the BIOS part.
     23 *
     24 * The BusLogic interface if available will be starting at port 0x330 and the
     25 * LsiLogic starts at 0x340 and each will have a size of 4 ports. The ports are
     26 * used as described below:
    2827 *
    2928 * +--------+--------+----------+
    … …  
    4544 * +--------+--------+----------+
    4645 *
    47  * The register at port 0 receives the SCSI CDB issued from the driver when writing to it but
    48  * before writing the actual CDB the first write gives the size of the CDB in bytes.
     46 * The register at port 0 receives the SCSI CDB issued from the driver when
     47 * writing to it but before writing the actual CDB the first write gives the
     48 * size of the CDB in bytes.
    4949 *
    50  * Reading the port at offset 0 gives status information about the adapter.
    51  * If the busy bit is set the adapter is processing a previous issued request if it is
     50 * Reading the port at offset 0 gives status information about the adapter. If
     51 * the busy bit is set the adapter is processing a previous issued request if it is
    5252 * cleared the command finished and the adapter can process another request.
    53  * The driver has to poll this bit because the adapter will not assert an IRQ for simplicity reasons.
     53 * The driver has to poll this bit because the adapter will not assert an IRQ
     54 * for simplicity reasons.
    5455 *
    55  * The register at offset 2 is to detect if a host adapter is available
    56  * If the driver writes a value to this port and gets the same value after reading it
     56 * The register at offset 2 is to detect if a host adapter is available. If the
     57 * driver writes a value to this port and gets the same value after reading it
    5758 * again the adapter is available.
    5859 *
    59  * Any write to the register at offset 3 causes the interface to be reset. A read returns
    60  * the SCSI status code of the last operation.
     60 * Any write to the register at offset 3 causes the interface to be reset. A
     61 * read returns the SCSI status code of the last operation.
    6162 *
    62  * This part has no R0 or GC components.
     63 * This part has no R0 or RC components.
    6364 */
    6465
    … …  
    101102    uint8_t              cbCDB;
    102103    /** The command to issue. */
    103     uint8_t              aCDB[12];
     104    uint8_t              abCDB[12];
    104105    /** Current position in the array. */
    105106    uint8_t              iCDB;
    … …  
    110111
    111112    /** Pointer to the buffer holding the data. */
    112     R3PTRTYPE(uint8_t *) pBuf;
     113    R3PTRTYPE(uint8_t *) pbBuf;
    113114    /** Size of the buffer in bytes. */
    114115    uint32_t             cbBuf;
    115     /** Current position in the buffer. */
     116    /** Current position in the buffer (offBuf if you like). */
    116117    uint32_t             iBuf;
    117118    /** The result code of last operation. */
    … …  
    142143                       RTGCPTR *pGCPtrDst, PRTGCUINTREG pcTransfer, unsigned cb);
    143144RT_C_DECLS_END
    144 #endif
     145#endif /* IN_RING3 */
    145146
    146 #endif /* ___Storage_VBoxSCSI_h */
     147#endif /* !___Storage_VBoxSCSI_h */
     148

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

    r44528 r44533  
    13951395    GEN_CHECK_OFF(VBOXSCSI, uTxDir);
    13961396    GEN_CHECK_OFF(VBOXSCSI, cbCDB);
    1397     GEN_CHECK_OFF(VBOXSCSI, aCDB);
    1398     GEN_CHECK_OFF(VBOXSCSI, aCDB[11]);
     1397    GEN_CHECK_OFF(VBOXSCSI, abCDB);
     1398    GEN_CHECK_OFF(VBOXSCSI, abCDB[11]);
    13991399    GEN_CHECK_OFF(VBOXSCSI, iCDB);
    1400     GEN_CHECK_OFF(VBOXSCSI, pBuf);
     1400    GEN_CHECK_OFF(VBOXSCSI, pbBuf);
    14011401    GEN_CHECK_OFF(VBOXSCSI, cbBuf);
    14021402    GEN_CHECK_OFF(VBOXSCSI, iBuf);

  • trunk/src/VBox/Main/Docs-Intro.cpp

    r39683 r44533  
    55
    66/*
    7  * Copyright (C) 2011 Oracle Corporation
     7 * Copyright (C) 2011-2013 Oracle Corporation
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette