Changeset 57393 in vbox for trunk/src/VBox/Devices/Storage
- Timestamp:
- Aug 17, 2015 3:02:05 PM (10 years ago)
- svn:sync-xref-src-repo-rev:
- 102157
- Location:
- trunk/src/VBox/Devices/Storage
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Devices/Storage/DevAHCI.cpp
r57358 r57393 4363 4363 } 4364 4364 4365 static intatapiReadSectors2352PostProcess(PAHCIREQ pAhciReq, void **ppvProc, size_t *pcbProc)4365 static DECLCALLBACK(int) atapiReadSectors2352PostProcess(PAHCIREQ pAhciReq, void **ppvProc, size_t *pcbProc) 4366 4366 { 4367 4367 uint8_t *pbBuf = NULL; -
trunk/src/VBox/Devices/Storage/DrvHostBase.cpp
r57358 r57393 1175 1175 * @param pcb Where to store the media size in bytes. 1176 1176 */ 1177 static intdrvHostBaseGetMediaSize(PDRVHOSTBASE pThis, uint64_t *pcb)1177 static DECLCALLBACK(int) drvHostBaseGetMediaSize(PDRVHOSTBASE pThis, uint64_t *pcb) 1178 1178 { 1179 1179 #if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD) -
trunk/src/VBox/Devices/Storage/DrvHostDVD.cpp
r57358 r57393 301 301 * @param pcb Where to store the size. 302 302 */ 303 static intdrvHostDvdGetMediaSize(PDRVHOSTBASE pThis, uint64_t *pcb)303 static DECLCALLBACK(int) drvHostDvdGetMediaSize(PDRVHOSTBASE pThis, uint64_t *pcb) 304 304 { 305 305 /* … … 415 415 416 416 /** @copydoc PDMIBLOCK::pfnSendCmd */ 417 static intdrvHostDvdSendCmd(PPDMIBLOCK pInterface, const uint8_t *pbCmd,418 PDMBLOCKTXDIR enmTxDir, void *pvBuf, uint32_t *pcbBuf,419 uint8_t *pabSense, size_t cbSense, uint32_t cTimeoutMillies)417 static DECLCALLBACK(int) drvHostDvdSendCmd(PPDMIBLOCK pInterface, const uint8_t *pbCmd, 418 PDMBLOCKTXDIR enmTxDir, void *pvBuf, uint32_t *pcbBuf, 419 uint8_t *pabSense, size_t cbSense, uint32_t cTimeoutMillies) 420 420 { 421 421 PDRVHOSTBASE pThis = PDMIBLOCK_2_DRVHOSTBASE(pInterface); -
trunk/src/VBox/Devices/Storage/DrvSCSI.cpp
r57358 r57393 269 269 } 270 270 271 static intdrvscsiTransferCompleteNotify(PPDMIBLOCKASYNCPORT pInterface, void *pvUser, int rc)271 static DECLCALLBACK(int) drvscsiTransferCompleteNotify(PPDMIBLOCKASYNCPORT pInterface, void *pvUser, int rc) 272 272 { 273 273 PDRVSCSI pThis = PDMIBLOCKASYNCPORT_2_DRVSCSI(pInterface); … … 478 478 } 479 479 480 static voiddrvscsiVScsiReqCompleted(VSCSIDEVICE hVScsiDevice, void *pVScsiDeviceUser,481 void *pVScsiReqUser, int rcScsiCode, bool fRedoPossible,482 int rcReq)480 static DECLCALLBACK(void) drvscsiVScsiReqCompleted(VSCSIDEVICE hVScsiDevice, void *pVScsiDeviceUser, 481 void *pVScsiReqUser, int rcScsiCode, bool fRedoPossible, 482 int rcReq) 483 483 { 484 484 PDRVSCSI pThis = (PDRVSCSI)pVScsiDeviceUser; … … 527 527 * @param pThread Pointer to the thread instance data. 528 528 */ 529 static intdrvscsiAsyncIOLoop(PPDMDRVINS pDrvIns, PPDMTHREAD pThread)529 static DECLCALLBACK(int) drvscsiAsyncIOLoop(PPDMDRVINS pDrvIns, PPDMTHREAD pThread) 530 530 { 531 531 int rc = VINF_SUCCESS; … … 566 566 } 567 567 568 static intdrvscsiAsyncIOLoopWakeup(PPDMDRVINS pDrvIns, PPDMTHREAD pThread)568 static DECLCALLBACK(int) drvscsiAsyncIOLoopWakeup(PPDMDRVINS pDrvIns, PPDMTHREAD pThread) 569 569 { 570 570 PDRVSCSI pThis = PDMINS_2_DATA(pDrvIns, PDRVSCSI); -
trunk/src/VBox/Devices/Storage/DrvSCSIHost.cpp
r57358 r57393 341 341 * @param pThread Pointer to the thread instance data. 342 342 */ 343 static intdrvscsihostAsyncIOLoop(PPDMDRVINS pDrvIns, PPDMTHREAD pThread)343 static DECLCALLBACK(int) drvscsihostAsyncIOLoop(PPDMDRVINS pDrvIns, PPDMTHREAD pThread) 344 344 { 345 345 int rc = VINF_SUCCESS; … … 360 360 } 361 361 362 static intdrvscsihostAsyncIOLoopWakeup(PPDMDRVINS pDrvIns, PPDMTHREAD pThread)362 static DECLCALLBACK(int) drvscsihostAsyncIOLoopWakeup(PPDMDRVINS pDrvIns, PPDMTHREAD pThread) 363 363 { 364 364 int rc; -
trunk/src/VBox/Devices/Storage/DrvVD.cpp
r57372 r57393 299 299 *********************************************************************************************************************************/ 300 300 301 static voiddrvvdErrorCallback(void *pvUser, int rc, RT_SRC_POS_DECL,301 static DECLCALLBACK(void) drvvdErrorCallback(void *pvUser, int rc, RT_SRC_POS_DECL, 302 302 const char *pszFormat, va_list va) 303 303 { … … 648 648 *********************************************************************************************************************************/ 649 649 650 static booldrvvdCfgAreKeysValid(void *pvUser, const char *pszzValid)650 static DECLCALLBACK(bool) drvvdCfgAreKeysValid(void *pvUser, const char *pszzValid) 651 651 { 652 652 return CFGMR3AreValuesValid((PCFGMNODE)pvUser, pszzValid); 653 653 } 654 654 655 static intdrvvdCfgQuerySize(void *pvUser, const char *pszName, size_t *pcb)655 static DECLCALLBACK(int) drvvdCfgQuerySize(void *pvUser, const char *pszName, size_t *pcb) 656 656 { 657 657 return CFGMR3QuerySize((PCFGMNODE)pvUser, pszName, pcb); 658 658 } 659 659 660 static intdrvvdCfgQuery(void *pvUser, const char *pszName, char *pszString, size_t cchString)660 static DECLCALLBACK(int) drvvdCfgQuery(void *pvUser, const char *pszName, char *pszString, size_t cchString) 661 661 { 662 662 return CFGMR3QueryString((PCFGMNODE)pvUser, pszName, pszString, cchString); 663 663 } 664 664 665 static intdrvvdCfgQueryBytes(void *pvUser, const char *pszName, void *ppvData, size_t cbData)665 static DECLCALLBACK(int) drvvdCfgQueryBytes(void *pvUser, const char *pszName, void *ppvData, size_t cbData) 666 666 { 667 667 return CFGMR3QueryBytes((PCFGMNODE)pvUser, pszName, ppvData, cbData); … … 1374 1374 } 1375 1375 1376 static intdrvvdTcpSelectOneExPoll(VDSOCKET Sock, uint32_t fEvents,1377 uint32_t *pfEvents, RTMSINTERVAL cMillies)1376 static DECLCALLBACK(int) drvvdTcpSelectOneExPoll(VDSOCKET Sock, uint32_t fEvents, 1377 uint32_t *pfEvents, RTMSINTERVAL cMillies) 1378 1378 { 1379 1379 int rc = VINF_SUCCESS; … … 2174 2174 2175 2175 /** @copydoc FNPDMBLKCACHEXFERCOMPLETEDRV */ 2176 static voiddrvvdBlkCacheXferComplete(PPDMDRVINS pDrvIns, void *pvUser, int rcReq)2176 static DECLCALLBACK(void) drvvdBlkCacheXferComplete(PPDMDRVINS pDrvIns, void *pvUser, int rcReq) 2177 2177 { 2178 2178 PVBOXDISK pThis = PDMINS_2_DATA(pDrvIns, PVBOXDISK); … … 2184 2184 2185 2185 /** @copydoc FNPDMBLKCACHEXFERENQUEUEDRV */ 2186 static intdrvvdBlkCacheXferEnqueue(PPDMDRVINS pDrvIns,2187 PDMBLKCACHEXFERDIR enmXferDir,2188 uint64_t off, size_t cbXfer,2189 PCRTSGBUF pcSgBuf, PPDMBLKCACHEIOXFER hIoXfer)2186 static DECLCALLBACK(int) drvvdBlkCacheXferEnqueue(PPDMDRVINS pDrvIns, 2187 PDMBLKCACHEXFERDIR enmXferDir, 2188 uint64_t off, size_t cbXfer, 2189 PCRTSGBUF pcSgBuf, PPDMBLKCACHEIOXFER hIoXfer) 2190 2190 { 2191 2191 int rc = VINF_SUCCESS; … … 2221 2221 2222 2222 /** @copydoc FNPDMBLKCACHEXFERENQUEUEDISCARDDRV */ 2223 static intdrvvdBlkCacheXferEnqueueDiscard(PPDMDRVINS pDrvIns, PCRTRANGE paRanges,2224 unsigned cRanges, PPDMBLKCACHEIOXFER hIoXfer)2223 static DECLCALLBACK(int) drvvdBlkCacheXferEnqueueDiscard(PPDMDRVINS pDrvIns, PCRTRANGE paRanges, 2224 unsigned cRanges, PPDMBLKCACHEIOXFER hIoXfer) 2225 2225 { 2226 2226 int rc = VINF_SUCCESS; -
trunk/src/VBox/Devices/Storage/UsbMsd.cpp
r57358 r57393 2252 2252 * @copydoc PDMUSBREG::pfnDestruct 2253 2253 */ 2254 static voidusbMsdDestruct(PPDMUSBINS pUsbIns)2254 static DECLCALLBACK(void) usbMsdDestruct(PPDMUSBINS pUsbIns) 2255 2255 { 2256 2256 PUSBMSD pThis = PDMINS_2_DATA(pUsbIns, PUSBMSD);
Note:
See TracChangeset
for help on using the changeset viewer.