Index: /trunk/src/VBox/Devices/Storage/VSCSI/VSCSIDevice.cpp =================================================================== --- /trunk/src/VBox/Devices/Storage/VSCSI/VSCSIDevice.cpp (revision 65110) +++ /trunk/src/VBox/Devices/Storage/VSCSI/VSCSIDevice.cpp (revision 65111) @@ -67,5 +67,5 @@ SCSIINQUIRYDATA ScsiInquiryReply; - vscsiReqSetXferSize(pVScsiReq, vscsiBE2HU16(&pVScsiReq->pbCDB[3])); + vscsiReqSetXferSize(pVScsiReq, scsiBE2H_U16(&pVScsiReq->pbCDB[3])); memset(&ScsiInquiryReply, 0, sizeof(ScsiInquiryReply)); ScsiInquiryReply.cbAdditional = 31; @@ -86,5 +86,5 @@ * to return an error. */ - vscsiReqSetXferSize(pVScsiReq, vscsiBE2HU32(&pVScsiReq->pbCDB[6])); + vscsiReqSetXferSize(pVScsiReq, scsiBE2H_U32(&pVScsiReq->pbCDB[6])); if (pVScsiReq->cbXfer < 16) *prcReq = vscsiReqSenseErrorSet(&pVScsiDevice->VScsiSense, pVScsiReq, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_INV_FIELD_IN_CMD_PACKET, 0x00); @@ -95,5 +95,5 @@ memset(aReply, 0, sizeof(aReply)); - vscsiH2BEU32(&aReply[0], 8); /* List length starts at position 0. */ + scsiH2BE_U32(&aReply[0], 8); /* List length starts at position 0. */ cbData = RTSgBufCopyFromBuf(&pVScsiReq->SgBuf, aReply, sizeof(aReply)); if (cbData < 16) @@ -141,6 +141,6 @@ uint8_t u8ReportMode = pVScsiReq->pbCDB[2] & 0x7; uint8_t u8Opc = pVScsiReq->pbCDB[3]; - uint16_t u16SvcAction = vscsiBE2HU16(&pVScsiReq->pbCDB[4]); - uint16_t cbData = vscsiBE2HU16(&pVScsiReq->pbCDB[6]); + uint16_t u16SvcAction = scsiBE2H_U16(&pVScsiReq->pbCDB[4]); + uint16_t cbData = scsiBE2H_U16(&pVScsiReq->pbCDB[6]); switch (u8ReportMode) Index: unk/src/VBox/Devices/Storage/VSCSI/VSCSIInline.h =================================================================== --- /trunk/src/VBox/Devices/Storage/VSCSI/VSCSIInline.h (revision 65110) +++ (revision ) @@ -1,98 +1,0 @@ -/* $Id$ */ -/** @file - * Virtual SCSI driver: Inline helpers - */ - -/* - * Copyright (C) 2006-2016 Oracle Corporation - * - * This file is part of VirtualBox Open Source Edition (OSE), as - * available from http://www.virtualbox.org. This file is free software; - * you can redistribute it and/or modify it under the terms of the GNU - * General Public License (GPL) as published by the Free Software - * Foundation, in version 2 as it comes in the "COPYING" file of the - * VirtualBox OSE distribution. VirtualBox OSE is distributed in the - * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. - */ -#ifndef ___VSCSIInline_h -#define ___VSCSIInline_h - -#include - -DECLINLINE(void) vscsiH2BEU16(uint8_t *pbBuf, uint16_t val) -{ - pbBuf[0] = val >> 8; - pbBuf[1] = val; -} - - -DECLINLINE(void) vscsiH2BEU24(uint8_t *pbBuf, uint32_t val) -{ - pbBuf[0] = val >> 16; - pbBuf[1] = val >> 8; - pbBuf[2] = val; -} - - -DECLINLINE(void) vscsiH2BEU32(uint8_t *pbBuf, uint32_t val) -{ - pbBuf[0] = val >> 24; - pbBuf[1] = val >> 16; - pbBuf[2] = val >> 8; - pbBuf[3] = val; -} - -DECLINLINE(void) vscsiH2BEU64(uint8_t *pbBuf, uint64_t val) -{ - pbBuf[0] = val >> 56; - pbBuf[1] = val >> 48; - pbBuf[2] = val >> 40; - pbBuf[3] = val >> 32; - pbBuf[4] = val >> 24; - pbBuf[5] = val >> 16; - pbBuf[6] = val >> 8; - pbBuf[7] = val; -} - -DECLINLINE(uint16_t) vscsiBE2HU16(const uint8_t *pbBuf) -{ - return (pbBuf[0] << 8) | pbBuf[1]; -} - - -DECLINLINE(uint32_t) vscsiBE2HU24(const uint8_t *pbBuf) -{ - return (pbBuf[0] << 16) | (pbBuf[1] << 8) | pbBuf[2]; -} - - -DECLINLINE(uint32_t) vscsiBE2HU32(const uint8_t *pbBuf) -{ - return (pbBuf[0] << 24) | (pbBuf[1] << 16) | (pbBuf[2] << 8) | pbBuf[3]; -} - -DECLINLINE(uint64_t) vscsiBE2HU64(const uint8_t *pbBuf) -{ - return ((uint64_t)pbBuf[0] << 56) - | ((uint64_t)pbBuf[1] << 48) - | ((uint64_t)pbBuf[2] << 40) - | ((uint64_t)pbBuf[3] << 32) - | ((uint64_t)pbBuf[4] << 24) - | ((uint64_t)pbBuf[5] << 16) - | ((uint64_t)pbBuf[6] << 8) - | (uint64_t)pbBuf[7]; -} - -DECLINLINE(void) vscsiPadStr(int8_t *pbDst, const char *pbSrc, uint32_t cbSize) -{ - for (uint32_t i = 0; i < cbSize; i++) - { - if (*pbSrc) - pbDst[i] = *pbSrc++; - else - pbDst[i] = ' '; - } -} - -#endif /* ___VSCSIInline_h */ - Index: /trunk/src/VBox/Devices/Storage/VSCSI/VSCSIInternal.h =================================================================== --- /trunk/src/VBox/Devices/Storage/VSCSI/VSCSIInternal.h (revision 65110) +++ /trunk/src/VBox/Devices/Storage/VSCSI/VSCSIInternal.h (revision 65111) @@ -20,9 +20,9 @@ #include #include +#include #include #include #include -#include "VSCSIInline.h" #include "VSCSIVpdPages.h" Index: /trunk/src/VBox/Devices/Storage/VSCSI/VSCSILunMmc.cpp =================================================================== --- /trunk/src/VBox/Devices/Storage/VSCSI/VSCSILunMmc.cpp (revision 65110) +++ /trunk/src/VBox/Devices/Storage/VSCSI/VSCSILunMmc.cpp (revision 65111) @@ -80,20 +80,4 @@ -DECLINLINE(void) mmcLBA2MSF(uint8_t *pbBuf, uint32_t iLBA) -{ - iLBA += 150; - pbBuf[0] = (iLBA / 75) / 60; - pbBuf[1] = (iLBA / 75) % 60; - pbBuf[2] = iLBA % 75; -} - -#if 0 /* unused */ -DECLINLINE(uint32_t) mmcMSF2LBA(const uint8_t *pbBuf) -{ - return (pbBuf[0] * 60 + pbBuf[1]) * 75 + pbBuf[2]; -} -#endif - - /* Fabricate normal TOC information. */ static int mmcReadTOCNormal(PVSCSILUNINT pVScsiLun, PVSCSIREQINT pVScsiReq, uint16_t cbMaxTransfer, bool fMSF) @@ -123,5 +107,5 @@ { *q++ = 0; /* reserved */ - mmcLBA2MSF(q, 0); + scsiLBA2MSF(q, 0); q += 3; } @@ -129,5 +113,5 @@ { /* sector 0 */ - vscsiH2BEU32(q, 0); + scsiH2BE_U32(q, 0); q += 4; } @@ -141,15 +125,15 @@ { *q++ = 0; /* reserved */ - mmcLBA2MSF(q, pVScsiLunMmc->cSectors); + scsiLBA2MSF(q, pVScsiLunMmc->cSectors); q += 3; } else { - vscsiH2BEU32(q, pVScsiLunMmc->cSectors); + scsiH2BE_U32(q, pVScsiLunMmc->cSectors); q += 4; } cbSize = q - pbBuf; Assert(cbSize <= sizeof(aReply)); - vscsiH2BEU16(pbBuf, cbSize - 2); + scsiH2BE_U16(pbBuf, cbSize - 2); if (cbSize < cbMaxTransfer) cbMaxTransfer = cbSize; @@ -178,10 +162,10 @@ { pbBuf[8] = 0; /* reserved */ - mmcLBA2MSF(pbBuf + 8, 0); + scsiLBA2MSF(pbBuf + 8, 0); } else { /* sector 0 */ - vscsiH2BEU32(pbBuf + 8, 0); + scsiH2BE_U32(pbBuf + 8, 0); } @@ -244,10 +228,10 @@ { *pbBuf++ = 0; /* reserved */ - mmcLBA2MSF(pbBuf, pVScsiLunMmc->cSectors); + scsiLBA2MSF(pbBuf, pVScsiLunMmc->cSectors); pbBuf += 3; } else { - vscsiH2BEU32(pbBuf, pVScsiLunMmc->cSectors); + scsiH2BE_U32(pbBuf, pVScsiLunMmc->cSectors); pbBuf += 4; } @@ -263,5 +247,5 @@ { *pbBuf++ = 0; /* reserved */ - mmcLBA2MSF(pbBuf, 0); + scsiLBA2MSF(pbBuf, 0); pbBuf += 3; } @@ -269,10 +253,10 @@ { /* sector 0 */ - vscsiH2BEU32(pbBuf, 0); + scsiH2BE_U32(pbBuf, 0); pbBuf += 4; } cbSize = pbBuf - aReply; - vscsiH2BEU16(&aReply[0], cbSize - 2); + scsiH2BE_U16(&aReply[0], cbSize - 2); RTSgBufCopyFromBuf(&pVScsiReq->SgBuf, aReply, RT_MIN(cbMaxTransfer, cbSize)); @@ -285,12 +269,12 @@ return 0; - vscsiH2BEU16(pbBuf, 0x0); /* feature 0: list of profiles supported */ + scsiH2BE_U16(pbBuf, 0x0); /* feature 0: list of profiles supported */ pbBuf[2] = (0 << 2) | (1 << 1) | (1 << 0); /* version 0, persistent, current */ pbBuf[3] = 8; /* additional bytes for profiles */ /* The MMC-3 spec says that DVD-ROM read capability should be reported * before CD-ROM read capability. */ - vscsiH2BEU16(pbBuf + 4, 0x10); /* profile: read-only DVD */ + scsiH2BE_U16(pbBuf + 4, 0x10); /* profile: read-only DVD */ pbBuf[6] = (0 << 0); /* NOT current profile */ - vscsiH2BEU16(pbBuf + 8, 0x08); /* profile: read only CD */ + scsiH2BE_U16(pbBuf + 8, 0x08); /* profile: read only CD */ pbBuf[10] = (1 << 0); /* current profile */ @@ -303,8 +287,8 @@ return 0; - vscsiH2BEU16(pbBuf, 0x1); /* feature 0001h: Core Feature */ + scsiH2BE_U16(pbBuf, 0x1); /* feature 0001h: Core Feature */ pbBuf[2] = (0x2 << 2) | RT_BIT(1) | RT_BIT(0); /* Version | Persistent | Current */ pbBuf[3] = 8; /* Additional length */ - vscsiH2BEU16(pbBuf + 4, 0x00000002); /* Physical interface ATAPI. */ + scsiH2BE_U16(pbBuf + 4, 0x00000002); /* Physical interface ATAPI. */ pbBuf[8] = RT_BIT(0); /* DBE */ /* Rest is reserved. */ @@ -318,5 +302,5 @@ return 0; - vscsiH2BEU16(pbBuf, 0x2); /* feature 0002h: Morphing Feature */ + scsiH2BE_U16(pbBuf, 0x2); /* feature 0002h: Morphing Feature */ pbBuf[2] = (0x1 << 2) | RT_BIT(1) | RT_BIT(0); /* Version | Persistent | Current */ pbBuf[3] = 4; /* Additional length */ @@ -332,5 +316,5 @@ return 0; - vscsiH2BEU16(pbBuf, 0x3); /* feature 0003h: Removable Medium Feature */ + scsiH2BE_U16(pbBuf, 0x3); /* feature 0003h: Removable Medium Feature */ pbBuf[2] = (0x2 << 2) | RT_BIT(1) | RT_BIT(0); /* Version | Persistent | Current */ pbBuf[3] = 4; /* Additional length */ @@ -347,9 +331,9 @@ return 0; - vscsiH2BEU16(pbBuf, 0x10); /* feature 0010h: Random Readable Feature */ + scsiH2BE_U16(pbBuf, 0x10); /* feature 0010h: Random Readable Feature */ pbBuf[2] = (0x0 << 2) | RT_BIT(1) | RT_BIT(0); /* Version | Persistent | Current */ pbBuf[3] = 8; /* Additional length */ - vscsiH2BEU32(pbBuf + 4, 2048); /* Logical block size. */ - vscsiH2BEU16(pbBuf + 8, 0x10); /* Blocking (0x10 for DVD, CD is not defined). */ + scsiH2BE_U32(pbBuf + 4, 2048); /* Logical block size. */ + scsiH2BE_U16(pbBuf + 8, 0x10); /* Blocking (0x10 for DVD, CD is not defined). */ pbBuf[10] = 0; /* PP not present */ /* Rest is reserved. */ @@ -363,5 +347,5 @@ return 0; - vscsiH2BEU16(pbBuf, 0x1e); /* feature 001Eh: CD Read Feature */ + scsiH2BE_U16(pbBuf, 0x1e); /* feature 001Eh: CD Read Feature */ pbBuf[2] = (0x2 << 2) | RT_BIT(1) | RT_BIT(0); /* Version | Persistent | Current */ pbBuf[3] = 0; /* Additional length */ @@ -377,5 +361,5 @@ return 0; - vscsiH2BEU16(pbBuf, 0x100); /* feature 0100h: Power Management Feature */ + scsiH2BE_U16(pbBuf, 0x100); /* feature 0100h: Power Management Feature */ pbBuf[2] = (0x0 << 2) | RT_BIT(1) | RT_BIT(0); /* Version | Persistent | Current */ pbBuf[3] = 0; /* Additional length */ @@ -389,5 +373,5 @@ return 0; - vscsiH2BEU16(pbBuf, 0x105); /* feature 0105h: Timeout Feature */ + scsiH2BE_U16(pbBuf, 0x105); /* feature 0105h: Timeout Feature */ pbBuf[2] = (0x0 << 2) | RT_BIT(1) | RT_BIT(0); /* Version | Persistent | Current */ pbBuf[3] = 4; /* Additional length */ @@ -413,5 +397,5 @@ /* Accept valid request types only, and only starting feature 0. */ - if ((pVScsiReq->pbCDB[1] & 0x03) == 3 || vscsiBE2HU16(&pVScsiReq->pbCDB[2]) != 0) + if ((pVScsiReq->pbCDB[1] & 0x03) == 3 || scsiBE2H_U16(&pVScsiReq->pbCDB[2]) != 0) return vscsiLunReqSenseErrorSet(&pVScsiLunMmc->Core, pVScsiReq, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_INV_FIELD_IN_CMD_PACKET, 0x00); @@ -420,7 +404,7 @@ * way to differentiate them right now is based on the image size). */ if (pVScsiLunMmc->cSectors) - vscsiH2BEU16(pbBuf + 6, 0x08); /* current profile: read-only CD */ + scsiH2BE_U16(pbBuf + 6, 0x08); /* current profile: read-only CD */ else - vscsiH2BEU16(pbBuf + 6, 0x00); /* current profile: none -> no media */ + scsiH2BE_U16(pbBuf + 6, 0x00); /* current profile: none -> no media */ cbBuf -= 8; pbBuf += 8; @@ -459,5 +443,5 @@ /* Set data length now. */ - vscsiH2BEU32(&aReply[0], (uint32_t)(sizeof(aReply) - cbBuf)); + scsiH2BE_U32(&aReply[0], (uint32_t)(sizeof(aReply) - cbBuf)); RTSgBufCopyFromBuf(&pVScsiReq->SgBuf, aReply, RT_MIN(cbMaxTransfer, sizeof(aReply) - cbBuf)); @@ -534,10 +518,10 @@ /* FIXME: 0x30000 per spec? */ - vscsiH2BEU32(&aReply[8], 0); /* start sector */ - vscsiH2BEU32(&aReply[12], cTotalSectors - 1); /* end sector */ - vscsiH2BEU32(&aReply[16], cTotalSectors - 1); /* l0 end sector */ + scsiH2BE_U32(&aReply[8], 0); /* start sector */ + scsiH2BE_U32(&aReply[12], cTotalSectors - 1); /* end sector */ + scsiH2BE_U32(&aReply[16], cTotalSectors - 1); /* l0 end sector */ /* Size of buffer, not including 2 byte size field */ - vscsiH2BEU32(&aReply[0], 2048 + 2); + scsiH2BE_U32(&aReply[0], 2048 + 2); /* 2k data + 4 byte header */ @@ -550,5 +534,5 @@ /* Size of buffer, not including 2 byte size field */ - vscsiH2BEU16(&aReply[0], 4 + 2); + scsiH2BE_U16(&aReply[0], 4 + 2); /* 4 byte header + 4 byte data */ @@ -562,5 +546,5 @@ case 0x04: /* DVD disc manufacturing information */ /* Size of buffer, not including 2 byte size field */ - vscsiH2BEU16(&aReply[0], 2048 + 2); + scsiH2BE_U16(&aReply[0], 2048 + 2); /* 2k data + 4 byte header */ @@ -575,20 +559,20 @@ aReply[4] = 0x00; /* Physical format */ aReply[5] = 0x40; /* Not writable, is readable */ - vscsiH2BEU16(&aReply[6], 2048 + 4); + scsiH2BE_U16(&aReply[6], 2048 + 4); aReply[8] = 0x01; /* Copyright info */ aReply[9] = 0x40; /* Not writable, is readable */ - vscsiH2BEU16(&aReply[10], 4 + 4); + scsiH2BE_U16(&aReply[10], 4 + 4); aReply[12] = 0x03; /* BCA info */ aReply[13] = 0x40; /* Not writable, is readable */ - vscsiH2BEU16(&aReply[14], 188 + 4); + scsiH2BE_U16(&aReply[14], 188 + 4); aReply[16] = 0x04; /* Manufacturing info */ aReply[17] = 0x40; /* Not writable, is readable */ - vscsiH2BEU16(&aReply[18], 2048 + 4); + scsiH2BE_U16(&aReply[18], 2048 + 4); /* Size of buffer, not including 2 byte size field */ - vscsiH2BEU16(&aReply[0], 16 + 2); + scsiH2BE_U16(&aReply[0], 16 + 2); /* data written + 4 byte header */ @@ -645,5 +629,5 @@ uint8_t aReply[16]; - vscsiH2BEU16(&aReply[0], 16 + 6); + scsiH2BE_U16(&aReply[0], 16 + 6); aReply[2] = (uint8_t)pVScsiLunMmc->u32MediaTrackType; aReply[3] = 0; @@ -669,5 +653,5 @@ uint8_t aReply[40]; - vscsiH2BEU16(&aReply[0], 38); + scsiH2BE_U16(&aReply[0], 38); aReply[2] = (uint8_t)pVScsiLunMmc->u32MediaTrackType; aReply[3] = 0; @@ -690,20 +674,20 @@ aReply[14] |= 1 << 1; /* report lock state */ aReply[15] = 0; /* no subchannel reads supported, no separate audio volume control, no changer etc. */ - vscsiH2BEU16(&aReply[16], 5632); /* (obsolete) claim 32x speed support */ - vscsiH2BEU16(&aReply[18], 2); /* number of audio volume levels */ - vscsiH2BEU16(&aReply[20], 128); /* buffer size supported in Kbyte - We don't have a buffer because we write directly into guest memory. + scsiH2BE_U16(&aReply[16], 5632); /* (obsolete) claim 32x speed support */ + scsiH2BE_U16(&aReply[18], 2); /* number of audio volume levels */ + scsiH2BE_U16(&aReply[20], 128); /* buffer size supported in Kbyte - We don't have a buffer because we write directly into guest memory. Just write some dummy value. */ - vscsiH2BEU16(&aReply[22], 5632); /* (obsolete) current read speed 32x */ + scsiH2BE_U16(&aReply[22], 5632); /* (obsolete) current read speed 32x */ aReply[24] = 0; /* reserved */ aReply[25] = 0; /* reserved for digital audio (see idx 15) */ - vscsiH2BEU16(&aReply[26], 0); /* (obsolete) maximum write speed */ - vscsiH2BEU16(&aReply[28], 0); /* (obsolete) current write speed */ - vscsiH2BEU16(&aReply[30], 0); /* copy management revision supported 0=no CSS */ + scsiH2BE_U16(&aReply[26], 0); /* (obsolete) maximum write speed */ + scsiH2BE_U16(&aReply[28], 0); /* (obsolete) current write speed */ + scsiH2BE_U16(&aReply[30], 0); /* copy management revision supported 0=no CSS */ aReply[32] = 0; /* reserved */ aReply[33] = 0; /* reserved */ aReply[34] = 0; /* reserved */ aReply[35] = 1; /* rotation control CAV */ - vscsiH2BEU16(&aReply[36], 0); /* current write speed */ - vscsiH2BEU16(&aReply[38], 0); /* number of write speed performance descriptors */ + scsiH2BE_U16(&aReply[36], 0); /* current write speed */ + scsiH2BE_U16(&aReply[38], 0); /* number of write speed performance descriptors */ RTSgBufCopyFromBuf(&pVScsiReq->SgBuf, aReply, RT_MIN(cbMaxTransfer, sizeof(aReply))); rcReq = vscsiLunReqSenseOkSet(&pVScsiLunMmc->Core, pVScsiReq); @@ -759,5 +743,5 @@ case MMCEVENTSTATUSTYPE_MEDIA_NEW: /* mount */ - vscsiH2BEU16(&aReply[0], 6); + scsiH2BE_U16(&aReply[0], 6); aReply[2] = 0x04; /* media */ aReply[3] = 0x5e; /* supported = busy|media|external|power|operational */ @@ -772,5 +756,5 @@ case MMCEVENTSTATUSTYPE_MEDIA_REMOVED: /* umount */ - vscsiH2BEU16(&aReply[0], 6); + scsiH2BE_U16(&aReply[0], 6); aReply[2] = 0x04; /* media */ aReply[3] = 0x5e; /* supported = busy|media|external|power|operational */ @@ -784,5 +768,5 @@ case MMCEVENTSTATUSTYPE_MEDIA_EJECT_REQUESTED: /* currently unused */ - vscsiH2BEU16(&aReply[0], 6); + scsiH2BE_U16(&aReply[0], 6); aReply[2] = 0x04; /* media */ aReply[3] = 0x5e; /* supported = busy|media|external|power|operational */ @@ -795,5 +779,5 @@ case MMCEVENTSTATUSTYPE_UNCHANGED: default: - vscsiH2BEU16(&aReply[0], 6); + scsiH2BE_U16(&aReply[0], 6); aReply[2] = 0x01; /* operational change request / notification */ aReply[3] = 0x5e; /* supported = busy|media|external|power|operational */ @@ -887,5 +871,5 @@ SCSIINQUIRYDATA ScsiInquiryReply; - vscsiReqSetXferSize(pVScsiReq, vscsiBE2HU16(&pVScsiReq->pbCDB[3])); + vscsiReqSetXferSize(pVScsiReq, scsiBE2H_U16(&pVScsiReq->pbCDB[3])); memset(&ScsiInquiryReply, 0, sizeof(ScsiInquiryReply)); @@ -897,7 +881,7 @@ ScsiInquiryReply.fCmdQue = 1; /* Command queuing supported. */ ScsiInquiryReply.fWBus16 = 1; - vscsiPadStr(ScsiInquiryReply.achVendorId, "VBOX", 8); - vscsiPadStr(ScsiInquiryReply.achProductId, "CD-ROM", 16); - vscsiPadStr(ScsiInquiryReply.achProductLevel, "1.0", 4); + scsiPadStrS(ScsiInquiryReply.achVendorId, "VBOX", 8); + scsiPadStrS(ScsiInquiryReply.achProductId, "CD-ROM", 16); + scsiPadStrS(ScsiInquiryReply.achProductLevel, "1.0", 4); RTSgBufCopyFromBuf(&pVScsiReq->SgBuf, (uint8_t *)&ScsiInquiryReply, sizeof(SCSIINQUIRYDATA)); @@ -916,8 +900,8 @@ */ if (pVScsiLunMmc->cSectors > UINT32_C(0xffffffff)) - vscsiH2BEU32(aReply, UINT32_C(0xffffffff)); + scsiH2BE_U32(aReply, UINT32_C(0xffffffff)); else - vscsiH2BEU32(aReply, pVScsiLunMmc->cSectors - 1); - vscsiH2BEU32(&aReply[4], pVScsiLunMmc->cbSector); + scsiH2BE_U32(aReply, pVScsiLunMmc->cSectors - 1); + scsiH2BE_U32(&aReply[4], pVScsiLunMmc->cbSector); RTSgBufCopyFromBuf(&pVScsiReq->SgBuf, aReply, sizeof(aReply)); rcReq = vscsiLunReqSenseOkSet(pVScsiLun, pVScsiReq); @@ -962,5 +946,5 @@ case SCSI_MODE_SENSE_10: { - size_t cbMax = vscsiBE2HU16(&pVScsiReq->pbCDB[7]); + size_t cbMax = scsiBE2H_U16(&pVScsiReq->pbCDB[7]); vscsiReqSetXferSize(pVScsiReq, cbMax); rcReq = vscsiLunMmcModeSense10(pVScsiLunMmc, pVScsiReq, cbMax); @@ -969,5 +953,5 @@ case SCSI_SEEK_10: { - uint32_t uLba = vscsiBE2HU32(&pVScsiReq->pbCDB[2]); + uint32_t uLba = scsiBE2H_U32(&pVScsiReq->pbCDB[2]); if (uLba > pVScsiLunMmc->cSectors) rcReq = vscsiLunReqSenseErrorSet(pVScsiLun, pVScsiReq, SCSI_SENSE_ILLEGAL_REQUEST, @@ -996,6 +980,6 @@ { enmTxDir = VSCSIIOREQTXDIR_READ; - uLbaStart = vscsiBE2HU32(&pVScsiReq->pbCDB[2]); - cSectorTransfer = vscsiBE2HU16(&pVScsiReq->pbCDB[7]); + uLbaStart = scsiBE2H_U32(&pVScsiReq->pbCDB[2]); + cSectorTransfer = scsiBE2H_U16(&pVScsiReq->pbCDB[7]); break; } @@ -1003,6 +987,6 @@ { enmTxDir = VSCSIIOREQTXDIR_READ; - uLbaStart = vscsiBE2HU32(&pVScsiReq->pbCDB[2]); - cSectorTransfer = vscsiBE2HU32(&pVScsiReq->pbCDB[6]); + uLbaStart = scsiBE2H_U32(&pVScsiReq->pbCDB[2]); + cSectorTransfer = scsiBE2H_U32(&pVScsiReq->pbCDB[6]); break; } @@ -1010,6 +994,6 @@ { enmTxDir = VSCSIIOREQTXDIR_READ; - uLbaStart = vscsiBE2HU64(&pVScsiReq->pbCDB[2]); - cSectorTransfer = vscsiBE2HU32(&pVScsiReq->pbCDB[10]); + uLbaStart = scsiBE2H_U64(&pVScsiReq->pbCDB[2]); + cSectorTransfer = scsiBE2H_U32(&pVScsiReq->pbCDB[10]); break; } @@ -1018,5 +1002,5 @@ uint8_t uDataMode = pVScsiReq->pbCDB[1] & 0x1f; - vscsiReqSetXferSize(pVScsiReq, vscsiBE2HU16(&pVScsiReq->pbCDB[6])); + vscsiReqSetXferSize(pVScsiReq, scsiBE2H_U16(&pVScsiReq->pbCDB[6])); switch (uDataMode) @@ -1072,5 +1056,5 @@ uint8_t uSubPageCode = pVScsiReq->pbCDB[3]; - vscsiReqSetXferSize(pVScsiReq, vscsiBE2HU16(&pVScsiReq->pbCDB[7])); + vscsiReqSetXferSize(pVScsiReq, scsiBE2H_U16(&pVScsiReq->pbCDB[7])); switch (uPageCode) @@ -1106,6 +1090,6 @@ memset(aReply, 0, sizeof(aReply)); - vscsiH2BEU64(aReply, pVScsiLunMmc->cSectors - 1); - vscsiH2BEU32(&aReply[8], pVScsiLunMmc->cbSector); + scsiH2BE_U64(aReply, pVScsiLunMmc->cSectors - 1); + scsiH2BE_U32(&aReply[8], pVScsiLunMmc->cbSector); /* Leave the rest 0 */ @@ -1135,5 +1119,5 @@ format = pVScsiReq->pbCDB[2] & 0x0f; - cbMax = vscsiBE2HU16(&pVScsiReq->pbCDB[7]); + cbMax = scsiBE2H_U16(&pVScsiReq->pbCDB[7]); fMSF = (pVScsiReq->pbCDB[1] >> 1) & 1; @@ -1158,5 +1142,5 @@ { /* Only supporting polled mode at the moment. */ - size_t cbMax = vscsiBE2HU16(&pVScsiReq->pbCDB[7]); + size_t cbMax = scsiBE2H_U16(&pVScsiReq->pbCDB[7]); vscsiReqSetXferSize(pVScsiReq, cbMax); @@ -1169,9 +1153,9 @@ case SCSI_MECHANISM_STATUS: { - size_t cbMax = vscsiBE2HU16(&pVScsiReq->pbCDB[8]); + size_t cbMax = scsiBE2H_U16(&pVScsiReq->pbCDB[8]); uint8_t aReply[8]; vscsiReqSetXferSize(pVScsiReq, cbMax); - vscsiH2BEU16(&aReply[0], 0); + scsiH2BE_U16(&aReply[0], 0); /* no current LBA */ aReply[2] = 0; @@ -1179,5 +1163,5 @@ aReply[4] = 0; aReply[5] = 1; - vscsiH2BEU16(&aReply[6], 0); + scsiH2BE_U16(&aReply[6], 0); RTSgBufCopyFromBuf(&pVScsiReq->SgBuf, aReply, RT_MIN(sizeof(aReply), cbMax)); rcReq = vscsiLunReqSenseOkSet(pVScsiLun, pVScsiReq); @@ -1187,9 +1171,9 @@ { uint8_t aReply[34]; - size_t cbMax = vscsiBE2HU16(&pVScsiReq->pbCDB[7]); + size_t cbMax = scsiBE2H_U16(&pVScsiReq->pbCDB[7]); vscsiReqSetXferSize(pVScsiReq, cbMax); memset(aReply, '\0', sizeof(aReply)); - vscsiH2BEU16(&aReply[0], 32); + scsiH2BE_U16(&aReply[0], 32); aReply[2] = (0 << 4) | (3 << 2) | (2 << 0); /* not erasable, complete session, complete disc */ aReply[3] = 1; /* number of first track */ @@ -1202,6 +1186,6 @@ aReply[10] = 0; /* number of sessions (MSB) */ aReply[11] = 0; /* number of sessions (MSB) */ - vscsiH2BEU32(&aReply[16], 0x00ffffff); /* last session lead-in start time is not available */ - vscsiH2BEU32(&aReply[20], 0x00ffffff); /* last possible start time for lead-out is not available */ + scsiH2BE_U32(&aReply[16], 0x00ffffff); /* last session lead-in start time is not available */ + scsiH2BE_U32(&aReply[20], 0x00ffffff); /* last possible start time for lead-out is not available */ RTSgBufCopyFromBuf(&pVScsiReq->SgBuf, aReply, RT_MIN(sizeof(aReply), cbMax)); rcReq = vscsiLunReqSenseOkSet(pVScsiLun, pVScsiReq); @@ -1210,9 +1194,9 @@ case SCSI_READ_TRACK_INFORMATION: { - size_t cbMax = vscsiBE2HU16(&pVScsiReq->pbCDB[7]); + size_t cbMax = scsiBE2H_U16(&pVScsiReq->pbCDB[7]); vscsiReqSetXferSize(pVScsiReq, cbMax); /* Accept address/number type of 1 only, and only track 1 exists. */ - if ((pVScsiReq->pbCDB[1] & 0x03) != 1 || vscsiBE2HU32(&pVScsiReq->pbCDB[2]) != 1) + if ((pVScsiReq->pbCDB[1] & 0x03) != 1 || scsiBE2H_U32(&pVScsiReq->pbCDB[2]) != 1) rcReq = vscsiLunReqSenseErrorSet(pVScsiLun, pVScsiReq, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_INV_FIELD_IN_CMD_PACKET, 0x00); @@ -1222,5 +1206,5 @@ RT_ZERO(aReply); - vscsiH2BEU16(&aReply[0], 34); + scsiH2BE_U16(&aReply[0], 34); aReply[2] = 1; /* track number (LSB) */ aReply[3] = 1; /* session number (LSB) */ @@ -1228,6 +1212,6 @@ aReply[6] = (0 << 7) | (0 << 6) | (0 << 5) | (0 << 6) | (1 << 0); /* not reserved track, not blank, not packet writing, not fixed packet, data mode 1 */ aReply[7] = (0 << 1) | (0 << 0); /* last recorded address not valid, next recordable address not valid */ - vscsiH2BEU32(&aReply[8], 0); /* track start address is 0 */ - vscsiH2BEU32(&aReply[24], pVScsiLunMmc->cSectors); /* track size */ + scsiH2BE_U32(&aReply[8], 0); /* track start address is 0 */ + scsiH2BE_U32(&aReply[24], pVScsiLunMmc->cSectors); /* track size */ aReply[32] = 0; /* track number (MSB) */ aReply[33] = 0; /* session number (MSB) */ @@ -1240,5 +1224,5 @@ case SCSI_GET_CONFIGURATION: { - size_t cbMax = vscsiBE2HU16(&pVScsiReq->pbCDB[7]); + size_t cbMax = scsiBE2H_U16(&pVScsiReq->pbCDB[7]); vscsiReqSetXferSize(pVScsiReq, cbMax); rcReq = vscsiLunMmcGetConfiguration(pVScsiLunMmc, pVScsiReq, cbMax); @@ -1247,5 +1231,5 @@ case SCSI_READ_DVD_STRUCTURE: { - size_t cbMax = vscsiBE2HU16(&pVScsiReq->pbCDB[8]); + size_t cbMax = scsiBE2H_U16(&pVScsiReq->pbCDB[8]); vscsiReqSetXferSize(pVScsiReq, cbMax); rcReq = vscsiLunMmcReadDvdStructure(pVScsiLunMmc, pVScsiReq, cbMax); Index: /trunk/src/VBox/Devices/Storage/VSCSI/VSCSILunSbc.cpp =================================================================== --- /trunk/src/VBox/Devices/Storage/VSCSI/VSCSILunSbc.cpp (revision 65110) +++ /trunk/src/VBox/Devices/Storage/VSCSI/VSCSILunSbc.cpp (revision 65111) @@ -203,5 +203,5 @@ case SCSI_INQUIRY: { - vscsiReqSetXferSize(pVScsiReq, vscsiBE2HU16(&pVScsiReq->pbCDB[3])); + vscsiReqSetXferSize(pVScsiReq, scsiBE2H_U16(&pVScsiReq->pbCDB[3])); /* Check for EVPD bit. */ @@ -233,7 +233,7 @@ ScsiInquiryReply.fCmdQue = 1; /* Command queuing supported. */ ScsiInquiryReply.fWBus16 = 1; - vscsiPadStr(ScsiInquiryReply.achVendorId, "VBOX", 8); - vscsiPadStr(ScsiInquiryReply.achProductId, "HARDDISK", 16); - vscsiPadStr(ScsiInquiryReply.achProductLevel, "1.0", 4); + scsiPadStrS(ScsiInquiryReply.achVendorId, "VBOX", 8); + scsiPadStrS(ScsiInquiryReply.achProductId, "HARDDISK", 16); + scsiPadStrS(ScsiInquiryReply.achProductLevel, "1.0", 4); RTSgBufCopyFromBuf(&pVScsiReq->SgBuf, (uint8_t *)&ScsiInquiryReply, sizeof(SCSIINQUIRYDATA)); @@ -254,8 +254,8 @@ */ if (pVScsiLunSbc->cSectors > UINT32_C(0xffffffff)) - vscsiH2BEU32(aReply, UINT32_C(0xffffffff)); + scsiH2BE_U32(aReply, UINT32_C(0xffffffff)); else - vscsiH2BEU32(aReply, pVScsiLunSbc->cSectors - 1); - vscsiH2BEU32(&aReply[4], pVScsiLunSbc->cbSector); + scsiH2BE_U32(aReply, pVScsiLunSbc->cSectors - 1); + scsiH2BE_U32(&aReply[4], pVScsiLunSbc->cbSector); RTSgBufCopyFromBuf(&pVScsiReq->SgBuf, aReply, sizeof(aReply)); rcReq = vscsiLunReqSenseOkSet(pVScsiLun, pVScsiReq); @@ -320,5 +320,5 @@ uint32_t cbBlock; - cbBlock = vscsiBE2HU24(&abParms[4 + 5]); + cbBlock = scsiBE2H_U24(&abParms[4 + 5]); Log2(("SBC: set LOGICAL BLOCK LENGTH to %u\n", cbBlock)); if (cbBlock == 512) /* Fixed block size. */ @@ -344,6 +344,6 @@ { enmTxDir = VSCSIIOREQTXDIR_READ; - uLbaStart = vscsiBE2HU32(&pVScsiReq->pbCDB[2]); - cSectorTransfer = vscsiBE2HU16(&pVScsiReq->pbCDB[7]); + uLbaStart = scsiBE2H_U32(&pVScsiReq->pbCDB[2]); + cSectorTransfer = scsiBE2H_U16(&pVScsiReq->pbCDB[7]); break; } @@ -351,6 +351,6 @@ { enmTxDir = VSCSIIOREQTXDIR_READ; - uLbaStart = vscsiBE2HU32(&pVScsiReq->pbCDB[2]); - cSectorTransfer = vscsiBE2HU32(&pVScsiReq->pbCDB[6]); + uLbaStart = scsiBE2H_U32(&pVScsiReq->pbCDB[2]); + cSectorTransfer = scsiBE2H_U32(&pVScsiReq->pbCDB[6]); break; } @@ -358,6 +358,6 @@ { enmTxDir = VSCSIIOREQTXDIR_READ; - uLbaStart = vscsiBE2HU64(&pVScsiReq->pbCDB[2]); - cSectorTransfer = vscsiBE2HU32(&pVScsiReq->pbCDB[10]); + uLbaStart = scsiBE2H_U64(&pVScsiReq->pbCDB[2]); + cSectorTransfer = scsiBE2H_U32(&pVScsiReq->pbCDB[10]); break; } @@ -374,6 +374,6 @@ { enmTxDir = VSCSIIOREQTXDIR_WRITE; - uLbaStart = vscsiBE2HU32(&pVScsiReq->pbCDB[2]); - cSectorTransfer = vscsiBE2HU16(&pVScsiReq->pbCDB[7]); + uLbaStart = scsiBE2H_U32(&pVScsiReq->pbCDB[2]); + cSectorTransfer = scsiBE2H_U16(&pVScsiReq->pbCDB[7]); break; } @@ -381,6 +381,6 @@ { enmTxDir = VSCSIIOREQTXDIR_WRITE; - uLbaStart = vscsiBE2HU32(&pVScsiReq->pbCDB[2]); - cSectorTransfer = vscsiBE2HU32(&pVScsiReq->pbCDB[6]); + uLbaStart = scsiBE2H_U32(&pVScsiReq->pbCDB[2]); + cSectorTransfer = scsiBE2H_U32(&pVScsiReq->pbCDB[6]); break; } @@ -388,6 +388,6 @@ { enmTxDir = VSCSIIOREQTXDIR_WRITE; - uLbaStart = vscsiBE2HU64(&pVScsiReq->pbCDB[2]); - cSectorTransfer = vscsiBE2HU32(&pVScsiReq->pbCDB[10]); + uLbaStart = scsiBE2H_U64(&pVScsiReq->pbCDB[2]); + cSectorTransfer = scsiBE2H_U32(&pVScsiReq->pbCDB[10]); break; } @@ -400,5 +400,5 @@ uint8_t uDataMode = pVScsiReq->pbCDB[1] & 0x1f; - vscsiReqSetXferSize(pVScsiReq, vscsiBE2HU16(&pVScsiReq->pbCDB[6])); + vscsiReqSetXferSize(pVScsiReq, scsiBE2H_U16(&pVScsiReq->pbCDB[6])); switch (uDataMode) @@ -441,5 +441,5 @@ uint8_t uSubPageCode = pVScsiReq->pbCDB[3]; - vscsiReqSetXferSize(pVScsiReq, vscsiBE2HU16(&pVScsiReq->pbCDB[7])); + vscsiReqSetXferSize(pVScsiReq, scsiBE2H_U16(&pVScsiReq->pbCDB[7])); switch (uPageCode) @@ -474,6 +474,6 @@ memset(aReply, 0, sizeof(aReply)); - vscsiH2BEU64(aReply, pVScsiLunSbc->cSectors - 1); - vscsiH2BEU32(&aReply[8], 512); + scsiH2BE_U64(aReply, pVScsiLunSbc->cSectors - 1); + scsiH2BE_U32(&aReply[8], 512); if (pVScsiLun->fFeatures & VSCSI_LUN_FEATURE_UNMAP) aReply[14] = 0x80; /* LPME enabled */ @@ -496,5 +496,5 @@ uint8_t abHdr[8]; size_t cbCopied; - size_t cbList = vscsiBE2HU16(&pVScsiReq->pbCDB[7]); + size_t cbList = scsiBE2H_U16(&pVScsiReq->pbCDB[7]); /* Copy the header. */ @@ -507,5 +507,5 @@ && cbList >= 8) { - uint32_t cBlkDesc = vscsiBE2HU16(&abHdr[2]) / 16; + uint32_t cBlkDesc = scsiBE2H_U16(&abHdr[2]) / 16; if (cBlkDesc) @@ -525,6 +525,6 @@ } - paRanges[i].offStart = vscsiBE2HU64(&abBlkDesc[0]) * 512; - paRanges[i].cbRange = vscsiBE2HU32(&abBlkDesc[8]) * 512; + paRanges[i].offStart = scsiBE2H_U64(&abBlkDesc[0]) * 512; + paRanges[i].cbRange = scsiBE2H_U32(&abBlkDesc[8]) * 512; } Index: /trunk/src/VBox/Devices/Storage/VSCSI/VSCSISense.cpp =================================================================== --- /trunk/src/VBox/Devices/Storage/VSCSI/VSCSISense.cpp (revision 65110) +++ /trunk/src/VBox/Devices/Storage/VSCSI/VSCSISense.cpp (revision 65111) @@ -69,5 +69,5 @@ pVScsiSense->abSenseBuf[0] = RT_BIT(7) | SCSI_SENSE_RESPONSE_CODE_CURR_FIXED; /* Fixed format */ pVScsiSense->abSenseBuf[2] = uSCSISenseKey; - vscsiH2BEU32(&pVScsiSense->abSenseBuf[3], uInfo); + scsiH2BE_U32(&pVScsiSense->abSenseBuf[3], uInfo); pVScsiSense->abSenseBuf[7] = 10; pVScsiSense->abSenseBuf[12] = uSCSIASC;