VirtualBox

Changeset 81847 in vbox


Ignore:
Timestamp:
Nov 14, 2019 8:50:15 PM (5 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
134641
Message:

DevATA: s/bATAPICmd/abATAPICmd/g + clang build fix. bugref:9218

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r81845 r81847  
    274274    uint32_t                            cbATAPISector;
    275275    /** ATAPI current command. */
    276     uint8_t                             aATAPICmd[ATAPI_PACKET_SIZE];
     276    uint8_t                             abATAPICmd[ATAPI_PACKET_SIZE];
    277277    /** ATAPI sense data. */
    278278    uint8_t                             abATAPISense[ATAPI_SENSE_SIZE];
    … …  
    20382038    memset(szBuf, 0, sizeof(szBuf));
    20392039
    2040     switch (s->aATAPICmd[0])
     2040    switch (s->abATAPICmd[0])
    20412041    {
    20422042        case SCSI_MODE_SELECT_10:
    … …  
    20742074         * us to handle commands with up to 128KB of data. The usual
    20752075         * imbalance of powers. */
    2076         uint8_t aATAPICmd[ATAPI_PACKET_SIZE];
     2076        uint8_t abATAPICmd[ATAPI_PACKET_SIZE];
    20772077        uint32_t iATAPILBA, cSectors, cReqSectors, cbCurrTX;
    20782078        uint8_t *pbBuf = s->abIOBuffer;
    … …  
    20822082        AssertStmt(cSectorsMax * s->cbATAPISector <= cbIOBuffer, cSectorsMax = cbIOBuffer / cbATAPISector);
    20832083
    2084         switch (s->aATAPICmd[0])
     2084        switch (s->abATAPICmd[0])
    20852085        {
    20862086            case SCSI_READ_10:
    20872087            case SCSI_WRITE_10:
    20882088            case SCSI_WRITE_AND_VERIFY_10:
    2089                 iATAPILBA = scsiBE2H_U32(s->aATAPICmd + 2);
    2090                 cSectors = scsiBE2H_U16(s->aATAPICmd + 7);
     2089                iATAPILBA = scsiBE2H_U32(s->abATAPICmd + 2);
     2090                cSectors = scsiBE2H_U16(s->abATAPICmd + 7);
    20912091                break;
    20922092            case SCSI_READ_12:
    20932093            case SCSI_WRITE_12:
    2094                 iATAPILBA = scsiBE2H_U32(s->aATAPICmd + 2);
    2095                 cSectors = scsiBE2H_U32(s->aATAPICmd + 6);
     2094                iATAPILBA = scsiBE2H_U32(s->abATAPICmd + 2);
     2095                cSectors = scsiBE2H_U32(s->abATAPICmd + 6);
    20962096                break;
    20972097            case SCSI_READ_CD:
    2098                 iATAPILBA = scsiBE2H_U32(s->aATAPICmd + 2);
    2099                 cSectors = scsiBE2H_U24(s->aATAPICmd + 6);
     2098                iATAPILBA = scsiBE2H_U32(s->abATAPICmd + 2);
     2099                cSectors = scsiBE2H_U24(s->abATAPICmd + 6);
    21002100                break;
    21012101            case SCSI_READ_CD_MSF:
    2102                 iATAPILBA = scsiMSF2LBA(s->aATAPICmd + 3);
    2103                 cSectors = scsiMSF2LBA(s->aATAPICmd + 6) - iATAPILBA;
     2102                iATAPILBA = scsiMSF2LBA(s->abATAPICmd + 3);
     2103                cSectors = scsiMSF2LBA(s->abATAPICmd + 6) - iATAPILBA;
    21042104                break;
    21052105            default:
    2106                 AssertMsgFailed(("Don't know how to split command %#04x\n", s->aATAPICmd[0]));
     2106                AssertMsgFailed(("Don't know how to split command %#04x\n", s->abATAPICmd[0]));
    21072107                if (s->cErrors++ < MAX_LOG_REL_ERRORS)
    21082108                    LogRel(("PIIX3 ATA: LUN#%d: CD-ROM passthrough split error\n", s->iLUN));
    … …  
    21122112        }
    21132113        cSectorsMax = RT_MIN(cSectorsMax, cSectors);
    2114         memcpy(aATAPICmd, s->aATAPICmd, ATAPI_PACKET_SIZE);
     2114        memcpy(abATAPICmd, s->abATAPICmd, ATAPI_PACKET_SIZE);
    21152115        cReqSectors = 0;
    21162116        for (uint32_t i = cSectorsMax; i > 0; i -= cReqSectors)
    … …  
    21212121                cReqSectors = i;
    21222122            cbCurrTX = cbATAPISector * cReqSectors;
    2123             switch (s->aATAPICmd[0])
     2123            switch (s->abATAPICmd[0])
    21242124            {
    21252125                case SCSI_READ_10:
    21262126                case SCSI_WRITE_10:
    21272127                case SCSI_WRITE_AND_VERIFY_10:
    2128                     scsiH2BE_U32(aATAPICmd + 2, iATAPILBA);
    2129                     scsiH2BE_U16(aATAPICmd + 7, cReqSectors);
     2128                    scsiH2BE_U32(abATAPICmd + 2, iATAPILBA);
     2129                    scsiH2BE_U16(abATAPICmd + 7, cReqSectors);
    21302130                    break;
    21312131                case SCSI_READ_12:
    21322132                case SCSI_WRITE_12:
    2133                     scsiH2BE_U32(aATAPICmd + 2, iATAPILBA);
    2134                     scsiH2BE_U32(aATAPICmd + 6, cReqSectors);
     2133                    scsiH2BE_U32(abATAPICmd + 2, iATAPILBA);
     2134                    scsiH2BE_U32(abATAPICmd + 6, cReqSectors);
    21352135                    break;
    21362136                case SCSI_READ_CD:
    2137                     scsiH2BE_U32(aATAPICmd + 2, iATAPILBA);
    2138                     scsiH2BE_U24(aATAPICmd + 6, cReqSectors);
     2137                    scsiH2BE_U32(abATAPICmd + 2, iATAPILBA);
     2138                    scsiH2BE_U24(abATAPICmd + 6, cReqSectors);
    21392139                    break;
    21402140                case SCSI_READ_CD_MSF:
    2141                     scsiLBA2MSF(aATAPICmd + 3, iATAPILBA);
    2142                     scsiLBA2MSF(aATAPICmd + 6, iATAPILBA + cReqSectors);
     2141                    scsiLBA2MSF(abATAPICmd + 3, iATAPILBA);
     2142                    scsiLBA2MSF(abATAPICmd + 6, iATAPILBA + cReqSectors);
    21432143                    break;
    21442144            }
    21452145            AssertLogRelReturn((uintptr_t)(pbBuf - &s->abIOBuffer[0]) + cbCurrTX <= sizeof(s->abIOBuffer), false);
    2146             rc = s->pDrvMedia->pfnSendCmd(s->pDrvMedia, aATAPICmd, ATAPI_PACKET_SIZE, (PDMMEDIATXDIR)s->uTxDir,
     2146            rc = s->pDrvMedia->pfnSendCmd(s->pDrvMedia, abATAPICmd, ATAPI_PACKET_SIZE, (PDMMEDIATXDIR)s->uTxDir,
    21472147                                          pbBuf, &cbCurrTX, abATAPISense, sizeof(abATAPISense), 30000 /**< @todo timeout */);
    21482148            if (rc != VINF_SUCCESS)
    … …  
    21552155        {
    21562156            /* Adjust ATAPI command for the next call. */
    2157             switch (s->aATAPICmd[0])
     2157            switch (s->abATAPICmd[0])
    21582158            {
    21592159                case SCSI_READ_10:
    21602160                case SCSI_WRITE_10:
    21612161                case SCSI_WRITE_AND_VERIFY_10:
    2162                     scsiH2BE_U32(s->aATAPICmd + 2, iATAPILBA);
    2163                     scsiH2BE_U16(s->aATAPICmd + 7, cSectors - cSectorsMax);
     2162                    scsiH2BE_U32(s->abATAPICmd + 2, iATAPILBA);
     2163                    scsiH2BE_U16(s->abATAPICmd + 7, cSectors - cSectorsMax);
    21642164                    break;
    21652165                case SCSI_READ_12:
    21662166                case SCSI_WRITE_12:
    2167                     scsiH2BE_U32(s->aATAPICmd + 2, iATAPILBA);
    2168                     scsiH2BE_U32(s->aATAPICmd + 6, cSectors - cSectorsMax);
     2167                    scsiH2BE_U32(s->abATAPICmd + 2, iATAPILBA);
     2168                    scsiH2BE_U32(s->abATAPICmd + 6, cSectors - cSectorsMax);
    21692169                    break;
    21702170                case SCSI_READ_CD:
    2171                     scsiH2BE_U32(s->aATAPICmd + 2, iATAPILBA);
    2172                     scsiH2BE_U24(s->aATAPICmd + 6, cSectors - cSectorsMax);
     2171                    scsiH2BE_U32(s->abATAPICmd + 2, iATAPILBA);
     2172                    scsiH2BE_U24(s->abATAPICmd + 6, cSectors - cSectorsMax);
    21732173                    break;
    21742174                case SCSI_READ_CD_MSF:
    2175                     scsiLBA2MSF(s->aATAPICmd + 3, iATAPILBA);
    2176                     scsiLBA2MSF(s->aATAPICmd + 6, iATAPILBA + cSectors - cSectorsMax);
     2175                    scsiLBA2MSF(s->abATAPICmd + 3, iATAPILBA);
     2176                    scsiLBA2MSF(s->abATAPICmd + 6, iATAPILBA + cSectors - cSectorsMax);
    21772177                    break;
    21782178                default:
    2179                     AssertMsgFailed(("Don't know how to split command %#04x\n", s->aATAPICmd[0]));
     2179                    AssertMsgFailed(("Don't know how to split command %#04x\n", s->abATAPICmd[0]));
    21802180                    if (s->cErrors++ < MAX_LOG_REL_ERRORS)
    21812181                        LogRel(("PIIX3 ATA: LUN#%d: CD-ROM passthrough split error\n", s->iLUN));
    … …  
    21882188    {
    21892189        AssertLogRelReturn(cbTransfer <= sizeof(s->abIOBuffer), false);
    2190         rc = s->pDrvMedia->pfnSendCmd(s->pDrvMedia, s->aATAPICmd, ATAPI_PACKET_SIZE, (PDMMEDIATXDIR)s->uTxDir,
     2190        rc = s->pDrvMedia->pfnSendCmd(s->pDrvMedia, s->abATAPICmd, ATAPI_PACKET_SIZE, (PDMMEDIATXDIR)s->uTxDir,
    21912191                                      s->abIOBuffer, &cbTransfer, abATAPISense, sizeof(abATAPISense), 30000 /**< @todo timeout */);
    21922192    }
    … …  
    22132213    {
    22142214        /* Do post processing for certain commands. */
    2215         switch (s->aATAPICmd[0])
     2215        switch (s->abATAPICmd[0])
    22162216        {
    22172217            case SCSI_SEND_CUE_SHEET:
    … …  
    22222222
    22232223                if (RT_SUCCESS(rc))
    2224                     rc = ATAPIPassthroughTrackListUpdate(s->pTrackList, s->aATAPICmd, s->abIOBuffer, sizeof(s->abIOBuffer));
     2224                    rc = ATAPIPassthroughTrackListUpdate(s->pTrackList, s->abATAPICmd, s->abIOBuffer, sizeof(s->abIOBuffer));
    22252225
    22262226                if (   RT_FAILURE(rc)
    22272227                    && s->cErrors++ < MAX_LOG_REL_ERRORS)
    22282228                    LogRel(("ATA: Error (%Rrc) while updating the tracklist during %s, burning the disc might fail\n",
    2229                             rc, s->aATAPICmd[0] == SCSI_SEND_CUE_SHEET ? "SEND CUE SHEET" : "READ TOC/PMA/ATIP"));
     2229                            rc, s->abATAPICmd[0] == SCSI_SEND_CUE_SHEET ? "SEND CUE SHEET" : "READ TOC/PMA/ATIP"));
    22302230                break;
    22312231            }
    … …  
    22472247                s->cbTotalTransfer = cbTransfer;
    22482248
    2249             if (   s->aATAPICmd[0] == SCSI_INQUIRY
     2249            if (   s->abATAPICmd[0] == SCSI_INQUIRY
    22502250                && s->fOverwriteInquiry)
    22512251            {
    … …  
    22792279        if (s->cErrors < MAX_LOG_REL_ERRORS)
    22802280        {
    2281             uint8_t u8Cmd = s->aATAPICmd[0];
     2281            uint8_t u8Cmd = s->abATAPICmd[0];
    22822282            do
    22832283            {
    … …  
    23022302{
    23032303    uint8_t *buf = s->abIOBuffer;
    2304     int media = s->aATAPICmd[1];
    2305     int format = s->aATAPICmd[7];
    2306 
    2307     uint16_t max_len = (uint16_t)RT_MIN(scsiBE2H_U16(&s->aATAPICmd[8]), sizeof(s->abIOBuffer));
     2304    int media = s->abATAPICmd[1];
     2305    int format = s->abATAPICmd[7];
     2306
     2307    AssertCompile(sizeof(s->abIOBuffer) > UINT16_MAX /* want a RT_MIN() below, but clang takes offence at always false stuff */);
     2308    uint16_t max_len = scsiBE2H_U16(&s->abATAPICmd[8]);
    23082309    memset(buf, 0, max_len);
    23092310
    … …  
    23382339                    case 0x0: /* Physical format information */
    23392340                    {
    2340                         int layer = s->aATAPICmd[6];
     2341                        int layer = s->abATAPICmd[6];
    23412342                        uint64_t total_sectors;
    23422343
    … …  
    25082509{
    25092510    uint8_t *pbBuf = s->abIOBuffer;
    2510     uint32_t u32LogAddr = scsiBE2H_U32(&s->aATAPICmd[2]);
    2511     uint8_t u8LogAddrType = s->aATAPICmd[1] & 0x03;
     2511    uint32_t u32LogAddr = scsiBE2H_U32(&s->abATAPICmd[2]);
     2512    uint8_t u8LogAddrType = s->abATAPICmd[1] & 0x03;
    25122513
    25132514    int rc;
    … …  
    27652766    uint32_t cbBuf = cbIOBuffer;
    27662767    uint32_t cbCopied = 0;
    2767     uint16_t u16Sfn = scsiBE2H_U16(&s->aATAPICmd[2]);
    2768     uint8_t u8Rt = s->aATAPICmd[1] & 0x03;
     2768    uint16_t u16Sfn = scsiBE2H_U16(&s->abATAPICmd[2]);
     2769    uint8_t u8Rt = s->abATAPICmd[1] & 0x03;
    27692770
    27702771    Assert(s->uTxDir == PDMMEDIATXDIR_FROM_DEVICE);
    … …  
    28292830    Assert(s->cbElementaryTransfer <= 8);
    28302831
    2831     if (!(s->aATAPICmd[1] & 1))
     2832    if (!(s->abATAPICmd[1] & 1))
    28322833    {
    28332834        /* no asynchronous operation supported */
    … …  
    30493050
    30503051    Assert(s->uTxDir == PDMMEDIATXDIR_FROM_DEVICE);
    3051     fMSF = (s->aATAPICmd[1] >> 1) & 1;
    3052     iStartTrack = s->aATAPICmd[6];
     3052    fMSF = (s->abATAPICmd[1] >> 1) & 1;
     3053    iStartTrack = s->abATAPICmd[6];
    30533054    if (iStartTrack == 0)
    30543055        iStartTrack = 1;
    … …  
    31363137    Assert(s->uTxDir == PDMMEDIATXDIR_FROM_DEVICE);
    31373138    Assert(s->cbElementaryTransfer <= 12);
    3138     fMSF = (s->aATAPICmd[1] >> 1) & 1;
     3139    fMSF = (s->abATAPICmd[1] >> 1) & 1;
    31393140    /* multi session: only a single session defined */
    31403141    /** @todo double-check this stuff against what a real drive says for a CD-ROM (not a CD-R)
    … …  
    31823183
    31833184    Assert(s->uTxDir == PDMMEDIATXDIR_FROM_DEVICE);
    3184     fMSF = (s->aATAPICmd[1] >> 1) & 1;
    3185     iStartTrack = s->aATAPICmd[6];
     3185    fMSF = (s->abATAPICmd[1] >> 1) & 1;
     3186    iStartTrack = s->abATAPICmd[6];
    31863187
    31873188    q = pbBuf + 2;
    … …  
    32643265static void atapiR3ParseCmdVirtualATAPI(ATADevState *s)
    32653266{
    3266     const uint8_t *pbPacket = s->aATAPICmd;
     3267    const uint8_t *pbPacket = s->abATAPICmd;
    32673268    uint32_t cbMax;
    32683269    uint32_t cSectors, iATAPILBA;
    … …  
    37273728static void atapiR3ParseCmdPassthrough(ATADevState *s)
    37283729{
    3729     const uint8_t *pbPacket = &s->aATAPICmd[0];
     3730    const uint8_t *pbPacket = &s->abATAPICmd[0];
    37303731
    37313732    /* Some cases we have to handle here. */
    … …  
    37503751            cbBuf = s->uATARegLCyl | (s->uATARegHCyl << 8); /* use ATAPI transfer length */
    37513752
    3752         bool fPassthrough = ATAPIPassthroughParseCdb(pbPacket, sizeof(s->aATAPICmd), cbBuf, s->pTrackList,
     3753        bool fPassthrough = ATAPIPassthroughParseCdb(pbPacket, sizeof(s->abATAPICmd), cbBuf, s->pTrackList,
    37533754                                                     &s->abATAPISense[0], sizeof(s->abATAPISense), &uTxDir, &cbTransfer,
    37543755                                                     &cbATAPISector, &u8ScsiSts);
    … …  
    37973798    const uint8_t *pbPacket;
    37983799
    3799     pbPacket = s->aATAPICmd;
     3800    pbPacket = s->abATAPICmd;
    38003801# ifdef DEBUG
    38013802    Log(("%s: LUN#%d DMA=%d CMD=%#04x \"%s\"\n", __FUNCTION__, s->iLUN, s->fDMA, pbPacket[0], SCSICmdText(pbPacket[0])));
    … …  
    38153816{
    38163817    s->fDMA = !!(s->uATARegFeature & 1);
    3817     memcpy(s->aATAPICmd, s->abIOBuffer, ATAPI_PACKET_SIZE);
     3818    memcpy(s->abATAPICmd, s->abIOBuffer, ATAPI_PACKET_SIZE);
    38183819    s->uTxDir = PDMMEDIATXDIR_NONE;
    38193820    s->cbTotalTransfer = 0;
    … …  
    60036004                     */
    60046005                    LogRel(("PIIX3 ATA: execution time for ATAPI command %#04x was %d seconds\n",
    6005                             pCtl->aIfs[pCtl->iAIOIf].aATAPICmd[0], uWait / (1000 * 1000)));
     6006                            pCtl->aIfs[pCtl->iAIOIf].abATAPICmd[0], uWait / (1000 * 1000)));
    60066007                }
    60076008            }
    … …  
    69796980            pHlp->pfnSSMPutU32(pSSM, pThis->aCts[i].aIfs[j].iATAPILBA);
    69806981            pHlp->pfnSSMPutU32(pSSM, pThis->aCts[i].aIfs[j].cbATAPISector);
    6981             pHlp->pfnSSMPutMem(pSSM, &pThis->aCts[i].aIfs[j].aATAPICmd, sizeof(pThis->aCts[i].aIfs[j].aATAPICmd));
     6982            pHlp->pfnSSMPutMem(pSSM, &pThis->aCts[i].aIfs[j].abATAPICmd, sizeof(pThis->aCts[i].aIfs[j].abATAPICmd));
    69826983            pHlp->pfnSSMPutMem(pSSM, &pThis->aCts[i].aIfs[j].abATAPISense, sizeof(pThis->aCts[i].aIfs[j].abATAPISense));
    69836984            pHlp->pfnSSMPutU8(pSSM, pThis->aCts[i].aIfs[j].cNotifiedMediaChange);
    … …  
    71577158            pHlp->pfnSSMGetU32(pSSM, &pThis->aCts[i].aIfs[j].iATAPILBA);
    71587159            pHlp->pfnSSMGetU32(pSSM, &pThis->aCts[i].aIfs[j].cbATAPISector);
    7159             pHlp->pfnSSMGetMem(pSSM, &pThis->aCts[i].aIfs[j].aATAPICmd, sizeof(pThis->aCts[i].aIfs[j].aATAPICmd));
     7160            pHlp->pfnSSMGetMem(pSSM, &pThis->aCts[i].aIfs[j].abATAPICmd, sizeof(pThis->aCts[i].aIfs[j].abATAPICmd));
    71607161            if (uVersion > ATA_SAVED_STATE_VERSION_WITHOUT_FULL_SENSE)
    71617162                pHlp->pfnSSMGetMem(pSSM, pThis->aCts[i].aIfs[j].abATAPISense, sizeof(pThis->aCts[i].aIfs[j].abATAPISense));
Note: See TracChangeset for help on using the changeset viewer.

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