VirtualBox

Changeset 85121 in vbox for trunk/include/VBox/vmm


Ignore:
Timestamp:
Jul 8, 2020 7:33:26 PM (5 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
139061
Message:

iprt/cdefs.h: Refactored the typedef use of DECLCALLBACK as well as DECLCALLBACKMEMBER to wrap the whole expression, similar to the DECLR?CALLBACKMEMBER macros. This allows adding a throw() at the end when compiling with the VC++ compiler to indicate that the callbacks won't throw anything, so we can stop supressing the C5039 warning about passing functions that can potential throw C++ exceptions to extern C code that can't necessarily cope with such (unwind,++). Introduced a few _EX variations that allows specifying different/no calling convention too, as that's handy when dynamically resolving host APIs. Fixed numerous places missing DECLCALLBACK and such. Left two angry @todos regarding use of CreateThread. bugref:9794

Location:
trunk/include/VBox/vmm
Files:
27 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/VBox/vmm/cfgm.h

    r82968 r85121  
    8282 * @param   pvUser      The argument supplied to VMR3Create().
    8383 */
    84 typedef DECLCALLBACK(int) FNCFGMCONSTRUCTOR(PUVM pUVM, PVM pVM, void *pvUser);
     84typedef DECLCALLBACKTYPE(int, FNCFGMCONSTRUCTOR,(PUVM pUVM, PVM pVM, void *pvUser));
    8585/** Pointer to a FNCFGMCONSTRUCTOR(). */
    8686typedef FNCFGMCONSTRUCTOR *PFNCFGMCONSTRUCTOR;

  • trunk/include/VBox/vmm/dbgf.h

    r84766 r85121  
    906906 * @param   pBp         Pointer to the breakpoint information. (readonly)
    907907 */
    908 typedef DECLCALLBACK(int) FNDBGFBPENUM(PUVM pUVM, void *pvUser, PCDBGFBP pBp);
     908typedef DECLCALLBACKTYPE(int, FNDBGFBPENUM,(PUVM pUVM, void *pvUser, PCDBGFBP pBp));
    909909/** Pointer to a breakpoint enumeration callback function. */
    910910typedef FNDBGFBPENUM *PFNDBGFBPENUM;
    … …  
    954954     * @param   ...         Arguments.
    955955     */
    956     DECLCALLBACKMEMBER(void, pfnPrintf)(PCDBGFINFOHLP pHlp, const char *pszFormat, ...) RT_IPRT_FORMAT_ATTR(2, 3);
     956    DECLCALLBACKMEMBER(void, pfnPrintf,(PCDBGFINFOHLP pHlp, const char *pszFormat, ...)) RT_IPRT_FORMAT_ATTR(2, 3);
    957957
    958958    /**
    … …  
    963963     * @param   args        Argument list.
    964964     */
    965     DECLCALLBACKMEMBER(void, pfnPrintfV)(PCDBGFINFOHLP pHlp, const char *pszFormat, va_list args) RT_IPRT_FORMAT_ATTR(2, 0);
     965    DECLCALLBACKMEMBER(void, pfnPrintfV,(PCDBGFINFOHLP pHlp, const char *pszFormat, va_list args)) RT_IPRT_FORMAT_ATTR(2, 0);
    966966
    967967    /**
    … …  
    973973     * @param   pState      The getopt state.
    974974     */
    975     DECLCALLBACKMEMBER(void, pfnGetOptError)(PCDBGFINFOHLP pHlp, int rc, union RTGETOPTUNION *pValueUnion,
    976                                              struct RTGETOPTSTATE *pState);
     975    DECLCALLBACKMEMBER(void, pfnGetOptError,(PCDBGFINFOHLP pHlp, int rc, union RTGETOPTUNION *pValueUnion,
     976                                             struct RTGETOPTSTATE *pState));
    977977} DBGFINFOHLP;
    978978
    … …  
    985985 * @param   pszArgs     Argument string. Optional and specific to the handler.
    986986 */
    987 typedef DECLCALLBACK(void) FNDBGFHANDLERDEV(PPDMDEVINS pDevIns, PCDBGFINFOHLP pHlp, const char *pszArgs);
     987typedef DECLCALLBACKTYPE(void, FNDBGFHANDLERDEV,(PPDMDEVINS pDevIns, PCDBGFINFOHLP pHlp, const char *pszArgs));
    988988/** Pointer to a FNDBGFHANDLERDEV function. */
    989989typedef FNDBGFHANDLERDEV  *PFNDBGFHANDLERDEV;
    … …  
    996996 * @param   pszArgs     Argument string. Optional and specific to the handler.
    997997 */
    998 typedef DECLCALLBACK(void) FNDBGFHANDLERDRV(PPDMDRVINS pDrvIns, PCDBGFINFOHLP pHlp, const char *pszArgs);
     998typedef DECLCALLBACKTYPE(void, FNDBGFHANDLERDRV,(PPDMDRVINS pDrvIns, PCDBGFINFOHLP pHlp, const char *pszArgs));
    999999/** Pointer to a FNDBGFHANDLERDRV function. */
    10001000typedef FNDBGFHANDLERDRV  *PFNDBGFHANDLERDRV;
    … …  
    10071007 * @param   pszArgs     Argument string. Optional and specific to the handler.
    10081008 */
    1009 typedef DECLCALLBACK(void) FNDBGFHANDLERINT(PVM pVM, PCDBGFINFOHLP pHlp, const char *pszArgs);
     1009typedef DECLCALLBACKTYPE(void, FNDBGFHANDLERINT,(PVM pVM, PCDBGFINFOHLP pHlp, const char *pszArgs));
    10101010/** Pointer to a FNDBGFHANDLERINT function. */
    10111011typedef FNDBGFHANDLERINT  *PFNDBGFHANDLERINT;
    … …  
    10181018 * @param   pszArgs     Argument string. Optional and specific to the handler.
    10191019 */
    1020 typedef DECLCALLBACK(void) FNDBGFHANDLEREXT(void *pvUser, PCDBGFINFOHLP pHlp, const char *pszArgs);
     1020typedef DECLCALLBACKTYPE(void, FNDBGFHANDLEREXT,(void *pvUser, PCDBGFINFOHLP pHlp, const char *pszArgs));
    10211021/** Pointer to a FNDBGFHANDLEREXT function. */
    10221022typedef FNDBGFHANDLEREXT  *PFNDBGFHANDLEREXT;
    … …  
    10301030 * @param   papszArgs   Argument vector.
    10311031 */
    1032 typedef DECLCALLBACK(void) FNDBGFINFOARGVDEV(PPDMDEVINS pDevIns, PCDBGFINFOHLP pHlp, int cArgs, char **papszArgs);
     1032typedef DECLCALLBACKTYPE(void, FNDBGFINFOARGVDEV,(PPDMDEVINS pDevIns, PCDBGFINFOHLP pHlp, int cArgs, char **papszArgs));
    10331033/** Pointer to a FNDBGFINFOARGVDEV function. */
    10341034typedef FNDBGFINFOARGVDEV *PFNDBGFINFOARGVDEV;
    … …  
    10421042 * @param   papszArgs   Argument vector.
    10431043 */
    1044 typedef DECLCALLBACK(void) FNDBGFINFOARGVUSB(PPDMUSBINS pUsbIns, PCDBGFINFOHLP pHlp, int cArgs, char **papszArgs);
     1044typedef DECLCALLBACKTYPE(void, FNDBGFINFOARGVUSB,(PPDMUSBINS pUsbIns, PCDBGFINFOHLP pHlp, int cArgs, char **papszArgs));
    10451045/** Pointer to a FNDBGFINFOARGVUSB function. */
    10461046typedef FNDBGFINFOARGVUSB *PFNDBGFINFOARGVUSB;
    … …  
    10541054 * @param   papszArgs   Argument vector.
    10551055 */
    1056 typedef DECLCALLBACK(void) FNDBGFINFOARGVDRV(PPDMDRVINS pDrvIns, PCDBGFINFOHLP pHlp, int cArgs, char **papszArgs);
     1056typedef DECLCALLBACKTYPE(void, FNDBGFINFOARGVDRV,(PPDMDRVINS pDrvIns, PCDBGFINFOHLP pHlp, int cArgs, char **papszArgs));
    10571057/** Pointer to a FNDBGFINFOARGVDRV function. */
    10581058typedef FNDBGFINFOARGVDRV *PFNDBGFINFOARGVDRV;
    … …  
    10661066 * @param   papszArgs   Argument vector.
    10671067 */
    1068 typedef DECLCALLBACK(void) FNDBGFINFOARGVINT(PVM pVM, PCDBGFINFOHLP pHlp, int cArgs, char **papszArgs);
     1068typedef DECLCALLBACKTYPE(void, FNDBGFINFOARGVINT,(PVM pVM, PCDBGFINFOHLP pHlp, int cArgs, char **papszArgs));
    10691069/** Pointer to a FNDBGFINFOARGVINT function. */
    10701070typedef FNDBGFINFOARGVINT *PFNDBGFINFOARGVINT;
    … …  
    10781078 * @param   papszArgs   Argument vector.
    10791079 */
    1080 typedef DECLCALLBACK(void) FNDBGFINFOARGVEXT(void *pvUser, PCDBGFINFOHLP pHlp, int cArgs, char **papszArgs);
     1080typedef DECLCALLBACKTYPE(void, FNDBGFINFOARGVEXT,(void *pvUser, PCDBGFINFOHLP pHlp, int cArgs, char **papszArgs));
    10811081/** Pointer to a FNDBGFINFOARGVEXT function. */
    10821082typedef FNDBGFINFOARGVEXT *PFNDBGFINFOARGVEXT;
    … …  
    11681168 * @param   pszDesc     The description.
    11691169 */
    1170 typedef DECLCALLBACK(int) FNDBGFINFOENUM(PUVM pUVM, const char *pszName, const char *pszDesc, void *pvUser);
     1170typedef DECLCALLBACKTYPE(int, FNDBGFINFOENUM,(PUVM pUVM, const char *pszName, const char *pszDesc, void *pvUser));
    11711171/** Pointer to a FNDBGFINFOENUM function. */
    11721172typedef FNDBGFINFOENUM *PFNDBGFINFOENUM;
    … …  
    19561956     * @remarks Does not take the device lock or anything like that.
    19571957     */
    1958     DECLCALLBACKMEMBER(int, pfnGet)(void *pvUser, struct DBGFREGSUBFIELD const *pSubField, PRTUINT128U puValue);
     1958    DECLCALLBACKMEMBER(int, pfnGet,(void *pvUser, struct DBGFREGSUBFIELD const *pSubField, PRTUINT128U puValue));
    19591959    /** Setter (optional).
    19601960     * @remarks Does not take the device lock or anything like that.
    19611961     */
    1962     DECLCALLBACKMEMBER(int, pfnSet)(void *pvUser, struct DBGFREGSUBFIELD const *pSubField, RTUINT128U uValue, RTUINT128U fMask);
     1962    DECLCALLBACKMEMBER(int, pfnSet,(void *pvUser, struct DBGFREGSUBFIELD const *pSubField, RTUINT128U uValue, RTUINT128U fMask));
    19631963} DBGFREGSUBFIELD;
    19641964/** Pointer to a const register sub-field descriptor. */
    … …  
    20172017     * @remarks Does not take the device lock or anything like that.
    20182018     */
    2019     DECLCALLBACKMEMBER(int, pfnGet)(void *pvUser, struct DBGFREGDESC const *pDesc, PDBGFREGVAL pValue);
     2019    DECLCALLBACKMEMBER(int, pfnGet,(void *pvUser, struct DBGFREGDESC const *pDesc, PDBGFREGVAL pValue));
    20202020    /** Setter.
    20212021     * @remarks Does not take the device lock or anything like that.
    20222022     */
    2023     DECLCALLBACKMEMBER(int, pfnSet)(void *pvUser, struct DBGFREGDESC const *pDesc, PCDBGFREGVAL pValue, PCDBGFREGVAL pfMask);
     2023    DECLCALLBACKMEMBER(int, pfnSet,(void *pvUser, struct DBGFREGDESC const *pDesc, PCDBGFREGVAL pValue, PCDBGFREGVAL pfMask));
    20242024    /** Aliases (optional). */
    20252025    PCDBGFREGALIAS          paAliases;
    … …  
    22022202     * @param   pvData  Pointer to the instance data.
    22032203     */
    2204     DECLCALLBACKMEMBER(int, pfnConstruct)(PUVM pUVM, void *pvData);
     2204    DECLCALLBACKMEMBER(int, pfnConstruct,(PUVM pUVM, void *pvData));
    22052205
    22062206    /**
    … …  
    22102210     * @param   pvData  Pointer to the instance data.
    22112211     */
    2212     DECLCALLBACKMEMBER(void, pfnDestruct)(PUVM pUVM, void *pvData);
     2212    DECLCALLBACKMEMBER(void, pfnDestruct,(PUVM pUVM, void *pvData));
    22132213
    22142214    /**
    … …  
    22222222     * @param   pvData  Pointer to the instance data.
    22232223     */
    2224     DECLCALLBACKMEMBER(bool, pfnProbe)(PUVM pUVM, void *pvData);
     2224    DECLCALLBACKMEMBER(bool, pfnProbe,(PUVM pUVM, void *pvData));
    22252225
    22262226    /**
    … …  
    22332233     * @param   pvData  Pointer to the instance data.
    22342234     */
    2235     DECLCALLBACKMEMBER(int, pfnInit)(PUVM pUVM, void *pvData);
     2235    DECLCALLBACKMEMBER(int, pfnInit,(PUVM pUVM, void *pvData));
    22362236
    22372237    /**
    … …  
    22442244     * @param   pvData  Pointer to the instance data.
    22452245     */
    2246     DECLCALLBACKMEMBER(int, pfnRefresh)(PUVM pUVM, void *pvData);
     2246    DECLCALLBACKMEMBER(int, pfnRefresh,(PUVM pUVM, void *pvData));
    22472247
    22482248    /**
    … …  
    22552255     * @param   pvData  Pointer to the instance data.
    22562256     */
    2257     DECLCALLBACKMEMBER(void, pfnTerm)(PUVM pUVM, void *pvData);
     2257    DECLCALLBACKMEMBER(void, pfnTerm,(PUVM pUVM, void *pvData));
    22582258
    22592259    /**
    … …  
    22682268     * @param   cchVersion  The size of the version string buffer.
    22692269     */
    2270     DECLCALLBACKMEMBER(int, pfnQueryVersion)(PUVM pUVM, void *pvData, char *pszVersion, size_t cchVersion);
     2270    DECLCALLBACKMEMBER(int, pfnQueryVersion,(PUVM pUVM, void *pvData, char *pszVersion, size_t cchVersion));
    22712271
    22722272    /**
    … …  
    22832283     * @param   enmIf   The interface identifier.
    22842284     */
    2285     DECLCALLBACKMEMBER(void *, pfnQueryInterface)(PUVM pUVM, void *pvData, DBGFOSINTERFACE enmIf);
     2285    DECLCALLBACKMEMBER(void *, pfnQueryInterface,(PUVM pUVM, void *pvData, DBGFOSINTERFACE enmIf));
    22862286
    22872287    /**
    … …  
    23002300     * @param   puScratch       Scratch area (initialized to zero, no dtor).
    23012301     */
    2302     DECLCALLBACKMEMBER(int, pfnStackUnwindAssist)(PUVM pUVM, void *pvData, VMCPUID idCpu, PDBGFSTACKFRAME pFrame,
     2302    DECLCALLBACKMEMBER(int, pfnStackUnwindAssist,(PUVM pUVM, void *pvData, VMCPUID idCpu, PDBGFSTACKFRAME pFrame,
    23032303                                                  PRTDBGUNWINDSTATE pState, PCCPUMCTX pInitialCtx, RTDBGAS hAs,
    2304                                                   uint64_t *puScratch);
     2304                                                  uint64_t *puScratch));
    23052305
    23062306    /** Trailing magic (DBGFOSREG_MAGIC). */
    … …  
    23472347     *                      holds the necessary buffer size.  Optional.
    23482348     */
    2349     DECLCALLBACKMEMBER(int, pfnQueryKernelLog)(struct DBGFOSIDMESG *pThis, PUVM pUVM, uint32_t fFlags, uint32_t cMessages,
    2350                                                char *pszBuf, size_t cbBuf, size_t *pcbActual);
     2349    DECLCALLBACKMEMBER(int, pfnQueryKernelLog,(struct DBGFOSIDMESG *pThis, PUVM pUVM, uint32_t fFlags, uint32_t cMessages,
     2350                                               char *pszBuf, size_t cbBuf, size_t *pcbActual));
    23512351    /** Trailing magic (DBGFOSIDMESG_MAGIC). */
    23522352    uint32_t    u32EndMagic;
    … …  
    24072407 * @param   uArg            Extra argument.
    24082408 */
    2409 typedef DECLCALLBACK(int) FNDBGFPLUGIN(DBGFPLUGINOP enmOperation, PUVM pUVM, uintptr_t uArg);
     2409typedef DECLCALLBACKTYPE(int, FNDBGFPLUGIN,(DBGFPLUGINOP enmOperation, PUVM pUVM, uintptr_t uArg));
    24102410/** Pointer to a FNDBGFPLUGIN. */
    24112411typedef FNDBGFPLUGIN *PFNDBGFPLUGIN;
    … …  
    26242624 * @param   pvUser          Opaque user data.
    26252625 */
    2626 typedef DECLCALLBACK(int) FNDBGFR3TYPEVALDUMP(uint32_t off, const char *pszField, uint32_t iLvl,
    2627                                               DBGFTYPEBUILTIN enmType, size_t cbType,
    2628                                               PDBGFTYPEVALBUF pValBuf, uint32_t cValBufs,
    2629                                               void *pvUser);
     2626typedef DECLCALLBACKTYPE(int, FNDBGFR3TYPEVALDUMP,(uint32_t off, const char *pszField, uint32_t iLvl,
     2627                                                   DBGFTYPEBUILTIN enmType, size_t cbType,
     2628                                                   PDBGFTYPEVALBUF pValBuf, uint32_t cValBufs, void *pvUser));
    26302629/** Pointer to a FNDBGFR3TYPEVALDUMP. */
    26312630typedef FNDBGFR3TYPEVALDUMP *PFNDBGFR3TYPEVALDUMP;
    … …  
    26442643 * @param   pvUser          Opaque user data.
    26452644 */
    2646 typedef DECLCALLBACK(int) FNDBGFR3TYPEDUMP(uint32_t off, const char *pszField, uint32_t iLvl,
    2647                                            const char *pszType, uint32_t fTypeFlags,
    2648                                            uint32_t cElements, void *pvUser);
     2645typedef DECLCALLBACKTYPE(int, FNDBGFR3TYPEDUMP,(uint32_t off, const char *pszField, uint32_t iLvl,
     2646                                                const char *pszType, uint32_t fTypeFlags,
     2647                                                uint32_t cElements, void *pvUser));
    26492648/** Pointer to a FNDBGFR3TYPEDUMP. */
    26502649typedef FNDBGFR3TYPEDUMP *PFNDBGFR3TYPEDUMP;

  • trunk/include/VBox/vmm/em.h

    r82968 r85121  
    116116 * @{
    117117 */
    118 typedef DECLCALLBACK(uint32_t)  FNEMULATEPARAM2UINT32(void *pvParam1, uint64_t val2);
    119 typedef FNEMULATEPARAM2UINT32  *PFNEMULATEPARAM2UINT32;
    120 typedef DECLCALLBACK(uint32_t)  FNEMULATEPARAM2(void *pvParam1, size_t val2);
    121 typedef FNEMULATEPARAM2        *PFNEMULATEPARAM2;
    122 typedef DECLCALLBACK(uint32_t)  FNEMULATEPARAM3(void *pvParam1, uint64_t val2, size_t val3);
    123 typedef FNEMULATEPARAM3        *PFNEMULATEPARAM3;
    124 typedef DECLCALLBACK(int)       FNEMULATELOCKPARAM2(void *pvParam1, uint64_t val2, RTGCUINTREG32 *pf);
    125 typedef FNEMULATELOCKPARAM2    *PFNEMULATELOCKPARAM2;
    126 typedef DECLCALLBACK(int)       FNEMULATELOCKPARAM3(void *pvParam1, uint64_t val2, size_t cb, RTGCUINTREG32 *pf);
    127 typedef FNEMULATELOCKPARAM3    *PFNEMULATELOCKPARAM3;
     118typedef DECLCALLBACKTYPE(uint32_t, FNEMULATEPARAM2UINT32,(void *pvParam1, uint64_t val2));
     119typedef FNEMULATEPARAM2UINT32    *PFNEMULATEPARAM2UINT32;
     120typedef DECLCALLBACKTYPE(uint32_t, FNEMULATEPARAM2,(void *pvParam1, size_t val2));
     121typedef FNEMULATEPARAM2          *PFNEMULATEPARAM2;
     122typedef DECLCALLBACKTYPE(uint32_t, FNEMULATEPARAM3,(void *pvParam1, uint64_t val2, size_t val3));
     123typedef FNEMULATEPARAM3          *PFNEMULATEPARAM3;
     124typedef DECLCALLBACKTYPE(int, FNEMULATELOCKPARAM2,(void *pvParam1, uint64_t val2, RTGCUINTREG32 *pf));
     125typedef FNEMULATELOCKPARAM2 *PFNEMULATELOCKPARAM2;
     126typedef DECLCALLBACKTYPE(int, FNEMULATELOCKPARAM3,(void *pvParam1, uint64_t val2, size_t cb, RTGCUINTREG32 *pf));
     127typedef FNEMULATELOCKPARAM3 *PFNEMULATELOCKPARAM3;
    128128/** @}  */
    129129

  • trunk/include/VBox/vmm/gim.h

    r82968 r85121  
    109109 * @param   pVM             The cross context VM structure.
    110110 */
    111 typedef DECLCALLBACK(void) FNGIMDEBUGBUFAVAIL(PVM pVM);
     111typedef DECLCALLBACKTYPE(void, FNGIMDEBUGBUFAVAIL,(PVM pVM));
    112112/** Pointer to GIM debug buffer available callback. */
    113113typedef FNGIMDEBUGBUFAVAIL *PFNGIMDEBUGBUFAVAIL;

  • trunk/include/VBox/vmm/gvmm.h

    r82989 r85121  
    166166 * @param   pvUser      The user parameter.
    167167 *  */
    168 typedef DECLCALLBACK(int) FNGVMMR0ENUMCALLBACK(PGVM pGVM, void *pvUser);
     168typedef DECLCALLBACKTYPE(int, FNGVMMR0ENUMCALLBACK,(PGVM pGVM, void *pvUser));
    169169/** Pointer to an VM enumeration callback function. */
    170170typedef FNGVMMR0ENUMCALLBACK *PFNGVMMR0ENUMCALLBACK;

  • trunk/include/VBox/vmm/iom.h

    r82968 r85121  
    189189 * @remarks Caller enters the device critical section.
    190190 */
    191 typedef DECLCALLBACK(int) FNIOMIOPORTIN(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t *pu32, unsigned cb);
     191typedef DECLCALLBACKTYPE(int, FNIOMIOPORTIN,(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t *pu32, unsigned cb));
    192192/** Pointer to a FNIOMIOPORTIN(). */
    193193typedef FNIOMIOPORTIN *PFNIOMIOPORTIN;
    … …  
    208208 * @remarks Caller enters the device critical section.
    209209 */
    210 typedef DECLCALLBACK(int) FNIOMIOPORTINSTRING(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint8_t *pbDst,
    211                                               uint32_t *pcTransfers, unsigned cb);
     210typedef DECLCALLBACKTYPE(int, FNIOMIOPORTINSTRING,(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint8_t *pbDst,
     211                                                   uint32_t *pcTransfers, unsigned cb));
    212212/** Pointer to a FNIOMIOPORTINSTRING(). */
    213213typedef FNIOMIOPORTINSTRING *PFNIOMIOPORTINSTRING;
    … …  
    225225 * @remarks Caller enters the device critical section.
    226226 */
    227 typedef DECLCALLBACK(int) FNIOMIOPORTOUT(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t u32, unsigned cb);
     227typedef DECLCALLBACKTYPE(int, FNIOMIOPORTOUT,(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t u32, unsigned cb));
    228228/** Pointer to a FNIOMIOPORTOUT(). */
    229229typedef FNIOMIOPORTOUT *PFNIOMIOPORTOUT;
    … …  
    243243 * @remarks Caller enters the device critical section.
    244244 */
    245 typedef DECLCALLBACK(int) FNIOMIOPORTOUTSTRING(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, const uint8_t *pbSrc,
    246                                                uint32_t *pcTransfers, unsigned cb);
     245typedef DECLCALLBACKTYPE(int, FNIOMIOPORTOUTSTRING,(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, const uint8_t *pbSrc,
     246                                                    uint32_t *pcTransfers, unsigned cb));
    247247/** Pointer to a FNIOMIOPORTOUTSTRING(). */
    248248typedef FNIOMIOPORTOUTSTRING *PFNIOMIOPORTOUTSTRING;
    … …  
    264264 * @remarks Caller enters the device critical section.
    265265 */
    266 typedef DECLCALLBACK(VBOXSTRICTRC) FNIOMIOPORTNEWIN(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT offPort, uint32_t *pu32, unsigned cb);
     266typedef DECLCALLBACKTYPE(VBOXSTRICTRC, FNIOMIOPORTNEWIN,(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT offPort,
     267                                                         uint32_t *pu32, unsigned cb));
    267268/** Pointer to a FNIOMIOPORTNEWIN(). */
    268269typedef FNIOMIOPORTNEWIN *PFNIOMIOPORTNEWIN;
    … …  
    284285 * @remarks Caller enters the device critical section.
    285286 */
    286 typedef DECLCALLBACK(VBOXSTRICTRC) FNIOMIOPORTNEWINSTRING(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT offPort, uint8_t *pbDst,
    287                                                           uint32_t *pcTransfers, unsigned cb);
     287typedef DECLCALLBACKTYPE(VBOXSTRICTRC, FNIOMIOPORTNEWINSTRING,(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT offPort, uint8_t *pbDst,
     288                                                               uint32_t *pcTransfers, unsigned cb));
    288289/** Pointer to a FNIOMIOPORTNEWINSTRING(). */
    289290typedef FNIOMIOPORTNEWINSTRING *PFNIOMIOPORTNEWINSTRING;
    … …  
    302303 * @remarks Caller enters the device critical section.
    303304 */
    304 typedef DECLCALLBACK(VBOXSTRICTRC) FNIOMIOPORTNEWOUT(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT offPort, uint32_t u32, unsigned cb);
     305typedef DECLCALLBACKTYPE(VBOXSTRICTRC, FNIOMIOPORTNEWOUT,(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT offPort,
     306                                                          uint32_t u32, unsigned cb));
    305307/** Pointer to a FNIOMIOPORTNEWOUT(). */
    306308typedef FNIOMIOPORTNEWOUT *PFNIOMIOPORTNEWOUT;
    … …  
    321323 * @remarks Caller enters the device critical section.
    322324 */
    323 typedef DECLCALLBACK(VBOXSTRICTRC) FNIOMIOPORTNEWOUTSTRING(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT offPort, const uint8_t *pbSrc,
    324                                                            uint32_t *pcTransfers, unsigned cb);
     325typedef DECLCALLBACKTYPE(VBOXSTRICTRC, FNIOMIOPORTNEWOUTSTRING,(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT offPort,
     326                                                                const uint8_t *pbSrc, uint32_t *pcTransfers, unsigned cb));
    325327/** Pointer to a FNIOMIOPORTNEWOUTSTRING(). */
    326328typedef FNIOMIOPORTNEWOUTSTRING *PFNIOMIOPORTNEWOUTSTRING;
    … …  
    358360 * @remarks Caller enters the device critical section.
    359361 */
    360 typedef DECLCALLBACK(int) FNIOMMMIOREAD(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr, void *pv, unsigned cb);
     362typedef DECLCALLBACKTYPE(int, FNIOMMMIOREAD,(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr, void *pv, unsigned cb));
    361363/** Pointer to a FNIOMMMIOREAD(). */
    362364typedef FNIOMMMIOREAD *PFNIOMMMIOREAD;
    … …  
    374376 * @remarks Caller enters the device critical section.
    375377 */
    376 typedef DECLCALLBACK(int) FNIOMMMIOWRITE(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr, void const *pv, unsigned cb);
     378typedef DECLCALLBACKTYPE(int, FNIOMMMIOWRITE,(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr, void const *pv, unsigned cb));
    377379/** Pointer to a FNIOMMMIOWRITE(). */
    378380typedef FNIOMMMIOWRITE *PFNIOMMMIOWRITE;
    … …  
    391393 * @remarks Caller enters the device critical section.
    392394 */
    393 typedef DECLCALLBACK(int) FNIOMMMIOFILL(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr, uint32_t u32Item, unsigned cbItem, unsigned cItems);
     395typedef DECLCALLBACKTYPE(int, FNIOMMMIOFILL,(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr,
     396                                             uint32_t u32Item, unsigned cbItem, unsigned cItems));
    394397/** Pointer to a FNIOMMMIOFILL(). */
    395398typedef FNIOMMMIOFILL *PFNIOMMMIOFILL;
    … …  
    409412 * @remarks Caller enters the device critical section.
    410413 */
    411 typedef DECLCALLBACK(VBOXSTRICTRC) FNIOMMMIONEWREAD(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS off, void *pv, uint32_t cb);
     414typedef DECLCALLBACKTYPE(VBOXSTRICTRC, FNIOMMMIONEWREAD,(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS off, void *pv, uint32_t cb));
    412415/** Pointer to a FNIOMMMIONEWREAD(). */
    413416typedef FNIOMMMIONEWREAD *PFNIOMMMIONEWREAD;
    … …  
    426429 * @remarks Caller enters the device critical section.
    427430 */
    428 typedef DECLCALLBACK(VBOXSTRICTRC) FNIOMMMIONEWWRITE(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS off, void const *pv, uint32_t cb);
     431typedef DECLCALLBACKTYPE(VBOXSTRICTRC, FNIOMMMIONEWWRITE,(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS off,
     432                                                          void const *pv, uint32_t cb));
    429433/** Pointer to a FNIOMMMIONEWWRITE(). */
    430434typedef FNIOMMMIONEWWRITE *PFNIOMMMIONEWWRITE;
    … …  
    444448 * @remarks Caller enters the device critical section.
    445449 */
    446 typedef DECLCALLBACK(VBOXSTRICTRC) FNIOMMMIONEWFILL(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS off,
    447                                                     uint32_t u32Item, uint32_t cbItem, uint32_t cItems);
     450typedef DECLCALLBACKTYPE(VBOXSTRICTRC, FNIOMMMIONEWFILL,(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS off,
     451                                                         uint32_t u32Item, uint32_t cbItem, uint32_t cItems));
    448452/** Pointer to a FNIOMMMIONEWFILL(). */
    449453typedef FNIOMMMIONEWFILL *PFNIOMMMIONEWFILL;

  • trunk/include/VBox/vmm/pdmapi.h

    r84826 r85121  
    6868 *                              unmapped.
    6969 */
    70 typedef DECLCALLBACK(void) FNPDMVMMDEVHEAPNOTIFY(PVM pVM, void *pvAllocation, RTGCPHYS GCPhysAllocation);
     70typedef DECLCALLBACKTYPE(void, FNPDMVMMDEVHEAPNOTIFY,(PVM pVM, void *pvAllocation, RTGCPHYS GCPhysAllocation));
    7171/** Pointer (ring-3) to a FNPDMVMMDEVHEAPNOTIFY function. */
    7272typedef R3PTRTYPE(FNPDMVMMDEVHEAPNOTIFY *) PFNPDMVMMDEVHEAPNOTIFY;
    … …  
    126126 * @param   pvArg           User argument.
    127127 */
    128 typedef DECLCALLBACK(int) FNPDMR3ENUM(PVM pVM, const char *pszFilename, const char *pszName,
    129                                       RTUINTPTR ImageBase, size_t cbImage, PDMLDRCTX enmCtx, void *pvArg);
     128typedef DECLCALLBACKTYPE(int, FNPDMR3ENUM,(PVM pVM, const char *pszFilename, const char *pszName,
     129                                           RTUINTPTR ImageBase, size_t cbImage, PDMLDRCTX enmCtx, void *pvArg));
    130130/** Pointer to a FNPDMR3ENUM() function. */
    131131typedef FNPDMR3ENUM *PFNPDMR3ENUM;

  • trunk/include/VBox/vmm/pdmasynccompletion.h

    r82968 r85121  
    6464 * @param   rc          The status code of the completed request.
    6565 */
    66 typedef DECLCALLBACK(void) FNPDMASYNCCOMPLETEDEV(PPDMDEVINS pDevIns, void *pvUser, int rc);
     66typedef DECLCALLBACKTYPE(void, FNPDMASYNCCOMPLETEDEV,(PPDMDEVINS pDevIns, void *pvUser, int rc));
    6767/** Pointer to a FNPDMASYNCCOMPLETEDEV(). */
    6868typedef FNPDMASYNCCOMPLETEDEV *PFNPDMASYNCCOMPLETEDEV;
    … …  
    7777 * @param   rc          The status code of the completed request.
    7878 */
    79 typedef DECLCALLBACK(void) FNPDMASYNCCOMPLETEDRV(PPDMDRVINS pDrvIns, void *pvTemplateUser, void *pvUser, int rc);
     79typedef DECLCALLBACKTYPE(void, FNPDMASYNCCOMPLETEDRV,(PPDMDRVINS pDrvIns, void *pvTemplateUser, void *pvUser, int rc));
    8080/** Pointer to a FNPDMASYNCCOMPLETEDRV(). */
    8181typedef FNPDMASYNCCOMPLETEDRV *PFNPDMASYNCCOMPLETEDRV;
    … …  
    8989 * @param   rc          The status code of the completed request.
    9090 */
    91 typedef DECLCALLBACK(void) FNPDMASYNCCOMPLETEUSB(PPDMUSBINS pUsbIns, void *pvUser, int rc);
     91typedef DECLCALLBACKTYPE(void, FNPDMASYNCCOMPLETEUSB,(PPDMUSBINS pUsbIns, void *pvUser, int rc));
    9292/** Pointer to a FNPDMASYNCCOMPLETEUSB(). */
    9393typedef FNPDMASYNCCOMPLETEUSB *PFNPDMASYNCCOMPLETEUSB;
    … …  
    102102 * @param   rc          The status code of the completed request.
    103103 */
    104 typedef DECLCALLBACK(void) FNPDMASYNCCOMPLETEINT(PVM pVM, void *pvUser, void *pvUser2, int rc);
     104typedef DECLCALLBACKTYPE(void, FNPDMASYNCCOMPLETEINT,(PVM pVM, void *pvUser, void *pvUser2, int rc));
    105105/** Pointer to a FNPDMASYNCCOMPLETEINT(). */
    106106typedef FNPDMASYNCCOMPLETEINT *PFNPDMASYNCCOMPLETEINT;

  • trunk/include/VBox/vmm/pdmaudioifs.h

    r82968 r85121  
    931931 * @todo r=bird: The @a paDst size is presumable given in @a pOpts->cFrames?
    932932 */
    933 typedef DECLCALLBACK(uint32_t) FNPDMAUDIOMIXBUFCONVFROM(PPDMAUDIOFRAME paDst, const void *pvSrc, uint32_t cbSrc,
    934                                                         PCPDMAUDMIXBUFCONVOPTS pOpts);
     933typedef DECLCALLBACKTYPE(uint32_t, FNPDMAUDIOMIXBUFCONVFROM,(PPDMAUDIOFRAME paDst, const void *pvSrc, uint32_t cbSrc,
     934                                                             PCPDMAUDMIXBUFCONVOPTS pOpts));
    935935/** Pointer to a convertion-from function used by the PDM audio buffer mixer. */
    936936typedef FNPDMAUDIOMIXBUFCONVFROM *PFNPDMAUDIOMIXBUFCONVFROM;
    … …  
    945945 *       this implicitly gives the pvDst size too, right?
    946946 */
    947 typedef DECLCALLBACK(void) FNPDMAUDIOMIXBUFCONVTO(void *pvDst, PCPDMAUDIOFRAME paSrc, PCPDMAUDMIXBUFCONVOPTS pOpts);
     947typedef DECLCALLBACKTYPE(void, FNPDMAUDIOMIXBUFCONVTO,(void *pvDst, PCPDMAUDIOFRAME paSrc, PCPDMAUDMIXBUFCONVOPTS pOpts));
    948948/** Pointer to a convertion-to function used by the PDM audio buffer mixer. */
    949949typedef FNPDMAUDIOMIXBUFCONVTO *PFNPDMAUDIOMIXBUFCONVTO;
    … …  
    13381338 * @param   cbUser              Size (in bytes) of user argument.
    13391339 */
    1340 typedef DECLCALLBACK(int) FNPDMHOSTAUDIOCALLBACK(PPDMDRVINS pDrvIns, PDMAUDIOBACKENDCBTYPE enmType, void *pvUser, size_t cbUser);
     1340typedef DECLCALLBACKTYPE(int, FNPDMHOSTAUDIOCALLBACK,(PPDMDRVINS pDrvIns, PDMAUDIOBACKENDCBTYPE enmType,
     1341                                                      void *pvUser, size_t cbUser));
    13411342/** Pointer to a FNPDMHOSTAUDIOCALLBACK(). */
    13421343typedef FNPDMHOSTAUDIOCALLBACK *PFNPDMHOSTAUDIOCALLBACK;

  • trunk/include/VBox/vmm/pdmblkcache.h

    r82968 r85121  
    7171 * @param   rc              The status code of the completed request.
    7272 */
    73 typedef DECLCALLBACK(void) FNPDMBLKCACHEXFERCOMPLETEDRV(PPDMDRVINS pDrvIns, void *pvUser, int rc);
     73typedef DECLCALLBACKTYPE(void, FNPDMBLKCACHEXFERCOMPLETEDRV,(PPDMDRVINS pDrvIns, void *pvUser, int rc));
    7474/** Pointer to a FNPDMBLKCACHEXFERCOMPLETEDRV(). */
    7575typedef FNPDMBLKCACHEXFERCOMPLETEDRV *PFNPDMBLKCACHEXFERCOMPLETEDRV;
    … …  
    8585 * @param   hIoXfer         I/O transfer handle to ping on completion.
    8686 */
    87 typedef DECLCALLBACK(int) FNPDMBLKCACHEXFERENQUEUEDRV(PPDMDRVINS pDrvIns, PDMBLKCACHEXFERDIR enmXferDir,
    88                                                       uint64_t off, size_t cbXfer, PCRTSGBUF pSgBuf, PPDMBLKCACHEIOXFER hIoXfer);
     87typedef DECLCALLBACKTYPE(int, FNPDMBLKCACHEXFERENQUEUEDRV,(PPDMDRVINS pDrvIns, PDMBLKCACHEXFERDIR enmXferDir, uint64_t off,
     88                                                           size_t cbXfer, PCRTSGBUF pSgBuf, PPDMBLKCACHEIOXFER hIoXfer));
    8989/** Pointer to a FNPDMBLKCACHEXFERENQUEUEDRV(). */
    9090typedef FNPDMBLKCACHEXFERENQUEUEDRV *PFNPDMBLKCACHEXFERENQUEUEDRV;
    … …  
    9898 * @param   hIoXfer         I/O handle to return on completion.
    9999 */
    100 typedef DECLCALLBACK(int) FNPDMBLKCACHEXFERENQUEUEDISCARDDRV(PPDMDRVINS pDrvIns, PCRTRANGE paRanges, unsigned cRanges,
    101                                                              PPDMBLKCACHEIOXFER hIoXfer);
     100typedef DECLCALLBACKTYPE(int, FNPDMBLKCACHEXFERENQUEUEDISCARDDRV,(PPDMDRVINS pDrvIns, PCRTRANGE paRanges, unsigned cRanges,
     101                                                                  PPDMBLKCACHEIOXFER hIoXfer));
    102102/** Pointer to a FNPDMBLKCACHEXFERENQUEUEDISCARDDRV(). */
    103103typedef FNPDMBLKCACHEXFERENQUEUEDISCARDDRV *PFNPDMBLKCACHEXFERENQUEUEDISCARDDRV;
    … …  
    110110 * @param   rc              The status code of the completed request.
    111111 */
    112 typedef DECLCALLBACK(void) FNPDMBLKCACHEXFERCOMPLETEDEV(PPDMDEVINS pDevIns, void *pvUser, int rc);
     112typedef DECLCALLBACKTYPE(void, FNPDMBLKCACHEXFERCOMPLETEDEV,(PPDMDEVINS pDevIns, void *pvUser, int rc));
    113113/** Pointer to a FNPDMBLKCACHEXFERCOMPLETEDEV(). */
    114114typedef FNPDMBLKCACHEXFERCOMPLETEDEV *PFNPDMBLKCACHEXFERCOMPLETEDEV;
    … …  
    124124 * @param   hIoXfer         I/O transfer handle to ping on completion.
    125125 */
    126 typedef DECLCALLBACK(int) FNPDMBLKCACHEXFERENQUEUEDEV(PPDMDEVINS pDevIns, PDMBLKCACHEXFERDIR enmXferDir,
    127                                                       uint64_t off, size_t cbXfer, PCRTSGBUF pSgBuf, PPDMBLKCACHEIOXFER hIoXfer);
     126typedef DECLCALLBACKTYPE(int, FNPDMBLKCACHEXFERENQUEUEDEV,(PPDMDEVINS pDevIns, PDMBLKCACHEXFERDIR enmXferDir, uint64_t off,
     127                                                           size_t cbXfer, PCRTSGBUF pSgBuf, PPDMBLKCACHEIOXFER hIoXfer));
    128128/** Pointer to a FNPDMBLKCACHEXFERENQUEUEDEV(). */
    129129typedef FNPDMBLKCACHEXFERENQUEUEDEV *PFNPDMBLKCACHEXFERENQUEUEDEV;
    … …  
    137137 * @param   hIoXfer         I/O handle to return on completion.
    138138 */
    139 typedef DECLCALLBACK(int) FNPDMBLKCACHEXFERENQUEUEDISCARDDEV(PPDMDEVINS pDevIns, PCRTRANGE paRanges, unsigned cRanges,
    140                                                              PPDMBLKCACHEIOXFER hIoXfer);
     139typedef DECLCALLBACKTYPE(int, FNPDMBLKCACHEXFERENQUEUEDISCARDDEV,(PPDMDEVINS pDevIns, PCRTRANGE paRanges, unsigned cRanges,
     140                                                                  PPDMBLKCACHEIOXFER hIoXfer));
    141141/** Pointer to a FNPDMBLKCACHEXFERENQUEUEDISCARDDEV(). */
    142142typedef FNPDMBLKCACHEXFERENQUEUEDISCARDDEV *PFNPDMBLKCACHEXFERENQUEUEDISCARDDEV;
    … …  
    149149 * @param   rc              The status code of the completed request.
    150150 */
    151 typedef DECLCALLBACK(void) FNPDMBLKCACHEXFERCOMPLETEINT(void *pvUserInt, void *pvUser, int rc);
     151typedef DECLCALLBACKTYPE(void, FNPDMBLKCACHEXFERCOMPLETEINT,(void *pvUserInt, void *pvUser, int rc));
    152152/** Pointer to a FNPDMBLKCACHEXFERCOMPLETEINT(). */
    153153typedef FNPDMBLKCACHEXFERCOMPLETEINT *PFNPDMBLKCACHEXFERCOMPLETEINT;
    … …  
    163163 * @param   hIoXfer         I/O transfer handle to ping on completion.
    164164 */
    165 typedef DECLCALLBACK(int) FNPDMBLKCACHEXFERENQUEUEINT(void *pvUser, PDMBLKCACHEXFERDIR enmXferDir,
    166                                                       uint64_t off, size_t cbXfer, PCRTSGBUF pSgBuf, PPDMBLKCACHEIOXFER hIoXfer);
     165typedef DECLCALLBACKTYPE(int, FNPDMBLKCACHEXFERENQUEUEINT,(void *pvUser, PDMBLKCACHEXFERDIR enmXferDir, uint64_t off,
     166                                                           size_t cbXfer, PCRTSGBUF pSgBuf, PPDMBLKCACHEIOXFER hIoXfer));
    167167/** Pointer to a FNPDMBLKCACHEXFERENQUEUEINT(). */
    168168typedef FNPDMBLKCACHEXFERENQUEUEINT *PFNPDMBLKCACHEXFERENQUEUEINT;
    … …  
    176176 * @param   hIoXfer         I/O handle to return on completion.
    177177 */
    178 typedef DECLCALLBACK(int) FNPDMBLKCACHEXFERENQUEUEDISCARDINT(void *pvUser, PCRTRANGE paRanges, unsigned cRanges,
    179                                                              PPDMBLKCACHEIOXFER hIoXfer);
     178typedef DECLCALLBACKTYPE(int, FNPDMBLKCACHEXFERENQUEUEDISCARDINT,(void *pvUser, PCRTRANGE paRanges, unsigned cRanges,
     179                                                                  PPDMBLKCACHEIOXFER hIoXfer));
    180180/** Pointer to a FNPDMBLKCACHEXFERENQUEUEDISCARDINT(). */
    181181typedef FNPDMBLKCACHEXFERENQUEUEDISCARDINT *PFNPDMBLKCACHEXFERENQUEUEDISCARDINT;
    … …  
    188188 * @param   rc              The status code of the completed request.
    189189 */
    190 typedef DECLCALLBACK(void) FNPDMBLKCACHEXFERCOMPLETEUSB(PPDMUSBINS pUsbIns, void *pvUser, int rc);
     190typedef DECLCALLBACKTYPE(void, FNPDMBLKCACHEXFERCOMPLETEUSB,(PPDMUSBINS pUsbIns, void *pvUser, int rc));
    191191/** Pointer to a FNPDMBLKCACHEXFERCOMPLETEUSB(). */
    192192typedef FNPDMBLKCACHEXFERCOMPLETEUSB *PFNPDMBLKCACHEXFERCOMPLETEUSB;
    … …  
    202202 * @param   hIoXfer         I/O transfer handle to ping on completion.
    203203 */
    204 typedef DECLCALLBACK(int) FNPDMBLKCACHEXFERENQUEUEUSB(PPDMUSBINS pUsbIns, PDMBLKCACHEXFERDIR enmXferDir,
    205                                                       uint64_t off, size_t cbXfer, PCRTSGBUF pSgBuf, PPDMBLKCACHEIOXFER hIoXfer);
     204typedef DECLCALLBACKTYPE(int, FNPDMBLKCACHEXFERENQUEUEUSB,(PPDMUSBINS pUsbIns, PDMBLKCACHEXFERDIR enmXferDir, uint64_t off,
     205                                                           size_t cbXfer, PCRTSGBUF pSgBuf, PPDMBLKCACHEIOXFER hIoXfer));
    206206/** Pointer to a FNPDMBLKCACHEXFERENQUEUEUSB(). */
    207207typedef FNPDMBLKCACHEXFERENQUEUEUSB *PFNPDMBLKCACHEXFERENQUEUEUSB;
    … …  
    215215 * @param   hIoXfer         I/O handle to return on completion.
    216216 */
    217 typedef DECLCALLBACK(int) FNPDMBLKCACHEXFERENQUEUEDISCARDUSB(PPDMUSBINS pUsbIns, PCRTRANGE paRanges, unsigned cRanges,
    218                                                              PPDMBLKCACHEIOXFER hIoXfer);
     217typedef DECLCALLBACKTYPE(int, FNPDMBLKCACHEXFERENQUEUEDISCARDUSB,(PPDMUSBINS pUsbIns, PCRTRANGE paRanges, unsigned cRanges,
     218                                                                  PPDMBLKCACHEIOXFER hIoXfer));
    219219/** Pointer to a FNPDMBLKCACHEXFERENQUEUEDISCARDUSB(). */
    220220typedef FNPDMBLKCACHEXFERENQUEUEDISCARDUSB *PFNPDMBLKCACHEXFERENQUEUEDISCARDUSB;

  • trunk/include/VBox/vmm/pdmcommon.h

    r82968 r85121  
    115115 * @thread  EMT(0)
    116116 */
    117 typedef DECLCALLBACK(bool) FNPDMUSBASYNCNOTIFY(PPDMUSBINS pUsbIns);
     117typedef DECLCALLBACKTYPE(bool, FNPDMUSBASYNCNOTIFY,(PPDMUSBINS pUsbIns));
    118118/** Pointer to a FNPDMUSBASYNCNOTIFY. */
    119119typedef FNPDMUSBASYNCNOTIFY *PFNPDMUSBASYNCNOTIFY;
    … …  
    131131 * @thread  EMT(0)
    132132 */
    133 typedef DECLCALLBACK(bool) FNPDMDEVASYNCNOTIFY(PPDMDEVINS pDevIns);
     133typedef DECLCALLBACKTYPE(bool, FNPDMDEVASYNCNOTIFY,(PPDMDEVINS pDevIns));
    134134/** Pointer to a FNPDMDEVASYNCNOTIFY. */
    135135typedef FNPDMDEVASYNCNOTIFY *PFNPDMDEVASYNCNOTIFY;
    … …  
    147147 * @thread  EMT(0)
    148148 */
    149 typedef DECLCALLBACK(bool) FNPDMDRVASYNCNOTIFY(PPDMDRVINS pDrvIns);
     149typedef DECLCALLBACKTYPE(bool, FNPDMDRVASYNCNOTIFY,(PPDMDRVINS pDrvIns));
    150150/** Pointer to a FNPDMDRVASYNCNOTIFY. */
    151151typedef FNPDMDRVASYNCNOTIFY *PFNPDMDRVASYNCNOTIFY;
    … …  
    160160 * @param   u64Arg      Optional integer argument for the operation.
    161161 */
    162 typedef DECLCALLBACK(int) FNPDMDEVREQHANDLERR0(PPDMDEVINS pDevIns, uint32_t uOperation, uint64_t u64Arg);
     162typedef DECLCALLBACKTYPE(int, FNPDMDEVREQHANDLERR0,(PPDMDEVINS pDevIns, uint32_t uOperation, uint64_t u64Arg));
    163163/** Ring-0 pointer to a FNPDMDEVREQHANDLERR0. */
    164164typedef R0PTRTYPE(FNPDMDEVREQHANDLERR0 *) PFNPDMDEVREQHANDLERR0;
    … …  
    172172 * @param   u64Arg      Optional integer argument for the operation.
    173173 */
    174 typedef DECLCALLBACK(int) FNPDMDRVREQHANDLERR0(PPDMDRVINS pDrvIns, uint32_t uOperation, uint64_t u64Arg);
     174typedef DECLCALLBACKTYPE(int, FNPDMDRVREQHANDLERR0,(PPDMDRVINS pDrvIns, uint32_t uOperation, uint64_t u64Arg));
    175175/** Ring-0 pointer to a FNPDMDRVREQHANDLERR0. */
    176176typedef R0PTRTYPE(FNPDMDRVREQHANDLERR0 *) PFNPDMDRVREQHANDLERR0;

  • trunk/include/VBox/vmm/pdmdev.h

    r85007 r85121  
    7575 *                      times, it can be found in pDevIns->pCfg.
    7676 */
    77 typedef DECLCALLBACK(int)   FNPDMDEVCONSTRUCT(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg);
     77typedef DECLCALLBACKTYPE(int, FNPDMDEVCONSTRUCT,(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg));
    7878/** Pointer to a FNPDMDEVCONSTRUCT() function. */
    7979typedef FNPDMDEVCONSTRUCT *PFNPDMDEVCONSTRUCT;
    … …  
    9191 *          the critical section, so the caller cannot exit it.
    9292 */
    93 typedef DECLCALLBACK(int)   FNPDMDEVDESTRUCT(PPDMDEVINS pDevIns);
     93typedef DECLCALLBACKTYPE(int, FNPDMDEVDESTRUCT,(PPDMDEVINS pDevIns));
    9494/** Pointer to a FNPDMDEVDESTRUCT() function. */
    9595typedef FNPDMDEVDESTRUCT *PFNPDMDEVDESTRUCT;
    … …  
    114114 *          not normally require any locking.
    115115 */
    116 typedef DECLCALLBACK(void) FNPDMDEVRELOCATE(PPDMDEVINS pDevIns, RTGCINTPTR offDelta);
     116typedef DECLCALLBACKTYPE(void, FNPDMDEVRELOCATE,(PPDMDEVINS pDevIns, RTGCINTPTR offDelta));
    117117/** Pointer to a FNPDMDEVRELOCATE() function. */
    118118typedef FNPDMDEVRELOCATE *PFNPDMDEVRELOCATE;
    … …  
    126126 * @remarks Caller enters the device critical section.
    127127 */
    128 typedef DECLCALLBACK(void)   FNPDMDEVPOWERON(PPDMDEVINS pDevIns);
     128typedef DECLCALLBACKTYPE(void, FNPDMDEVPOWERON,(PPDMDEVINS pDevIns));
    129129/** Pointer to a FNPDMDEVPOWERON() function. */
    130130typedef FNPDMDEVPOWERON *PFNPDMDEVPOWERON;
    … …  
    138138 * @remarks Caller enters the device critical section.
    139139 */
    140 typedef DECLCALLBACK(void)  FNPDMDEVRESET(PPDMDEVINS pDevIns);
     140typedef DECLCALLBACKTYPE(void, FNPDMDEVRESET,(PPDMDEVINS pDevIns));
    141141/** Pointer to a FNPDMDEVRESET() function. */
    142142typedef FNPDMDEVRESET *PFNPDMDEVRESET;
    … …  
    154154 * @remarks Caller enters the device critical section.
    155155 */
    156 typedef DECLCALLBACK(void)  FNPDMDEVSOFTRESET(PPDMDEVINS pDevIns, uint32_t fFlags);
     156typedef DECLCALLBACKTYPE(void, FNPDMDEVSOFTRESET,(PPDMDEVINS pDevIns, uint32_t fFlags));
    157157/** Pointer to a FNPDMDEVSOFTRESET() function. */
    158158typedef FNPDMDEVSOFTRESET *PFNPDMDEVSOFTRESET;
    … …  
    189189 * @remarks Caller enters the device critical section.
    190190 */
    191 typedef DECLCALLBACK(void)  FNPDMDEVSUSPEND(PPDMDEVINS pDevIns);
     191typedef DECLCALLBACKTYPE(void, FNPDMDEVSUSPEND,(PPDMDEVINS pDevIns));
    192192/** Pointer to a FNPDMDEVSUSPEND() function. */
    193193typedef FNPDMDEVSUSPEND *PFNPDMDEVSUSPEND;
    … …  
    201201 * @remarks Caller enters the device critical section.
    202202 */
    203 typedef DECLCALLBACK(void)  FNPDMDEVRESUME(PPDMDEVINS pDevIns);
     203typedef DECLCALLBACKTYPE(void, FNPDMDEVRESUME,(PPDMDEVINS pDevIns));
    204204/** Pointer to a FNPDMDEVRESUME() function. */
    205205typedef FNPDMDEVRESUME *PFNPDMDEVRESUME;
    … …  
    216216 * @remarks Caller enters the device critical section.
    217217 */
    218 typedef DECLCALLBACK(void)   FNPDMDEVPOWEROFF(PPDMDEVINS pDevIns);
     218typedef DECLCALLBACKTYPE(void, FNPDMDEVPOWEROFF,(PPDMDEVINS pDevIns));
    219219/** Pointer to a FNPDMDEVPOWEROFF() function. */
    220220typedef FNPDMDEVPOWEROFF *PFNPDMDEVPOWEROFF;
    … …  
    236236 * @remarks Caller enters the device critical section.
    237237 */
    238 typedef DECLCALLBACK(int)  FNPDMDEVATTACH(PPDMDEVINS pDevIns, unsigned iLUN, uint32_t fFlags);
     238typedef DECLCALLBACKTYPE(int, FNPDMDEVATTACH,(PPDMDEVINS pDevIns, unsigned iLUN, uint32_t fFlags));
    239239/** Pointer to a FNPDMDEVATTACH() function. */
    240240typedef FNPDMDEVATTACH *PFNPDMDEVATTACH;
    … …  
    255255 * @remarks Caller enters the device critical section.
    256256 */
    257 typedef DECLCALLBACK(void)  FNPDMDEVDETACH(PPDMDEVINS pDevIns, unsigned iLUN, uint32_t fFlags);
     257typedef DECLCALLBACKTYPE(void, FNPDMDEVDETACH,(PPDMDEVINS pDevIns, unsigned iLUN, uint32_t fFlags));
    258258/** Pointer to a FNPDMDEVDETACH() function. */
    259259typedef FNPDMDEVDETACH *PFNPDMDEVDETACH;
    … …  
    269269 * @remarks The device critical section is not entered.
    270270 */
    271 typedef DECLCALLBACK(int) FNPDMDEVQUERYINTERFACE(PPDMDEVINS pDevIns, unsigned iLUN, PPDMIBASE *ppBase);
     271typedef DECLCALLBACKTYPE(int, FNPDMDEVQUERYINTERFACE,(PPDMDEVINS pDevIns, unsigned iLUN, PPDMIBASE *ppBase));
    272272/** Pointer to a FNPDMDEVQUERYINTERFACE() function. */
    273273typedef FNPDMDEVQUERYINTERFACE *PFNPDMDEVQUERYINTERFACE;
    … …  
    284284 * @remarks Caller enters the device critical section.
    285285 */
    286 typedef DECLCALLBACK(int) FNPDMDEVINITCOMPLETE(PPDMDEVINS pDevIns);
     286typedef DECLCALLBACKTYPE(int, FNPDMDEVINITCOMPLETE,(PPDMDEVINS pDevIns));
    287287/** Pointer to a FNPDMDEVINITCOMPLETE() function. */
    288288typedef FNPDMDEVINITCOMPLETE *PFNPDMDEVINITCOMPLETE;
    … …  
    15301530     * @remarks Caller enters the PDM critical section.
    15311531     */
    1532     DECLCALLBACKMEMBER(void, pfnSetIrq)(PPDMDEVINS pDevIns, int iIrq, int iLevel, uint32_t uTagSrc);
     1532    DECLCALLBACKMEMBER(void, pfnSetIrq,(PPDMDEVINS pDevIns, int iIrq, int iLevel, uint32_t uTagSrc));
    15331533
    15341534    /**
    … …  
    15401540     * @remarks Caller enters the PDM critical section.
    15411541     */
    1542     DECLCALLBACKMEMBER(int, pfnGetInterrupt)(PPDMDEVINS pDevIns, uint32_t *puTagSrc);
     1542    DECLCALLBACKMEMBER(int, pfnGetInterrupt,(PPDMDEVINS pDevIns, uint32_t *puTagSrc));
    15431543
    15441544    /** Just a safety precaution. */
    … …  
    15641564     * @param   pDevIns         Device instance of the PIC.
    15651565     */
    1566     DECLCALLBACKMEMBER(void, pfnSetInterruptFF)(PPDMDEVINS pDevIns);
     1566    DECLCALLBACKMEMBER(void, pfnSetInterruptFF,(PPDMDEVINS pDevIns));
    15671567
    15681568    /**
    … …  
    15711571     * @param   pDevIns         Device instance of the PIC.
    15721572     */
    1573     DECLCALLBACKMEMBER(void, pfnClearInterruptFF)(PPDMDEVINS pDevIns);
     1573    DECLCALLBACKMEMBER(void, pfnClearInterruptFF,(PPDMDEVINS pDevIns));
    15741574
    15751575    /**
    … …  
    15811581     * @param   rc              What to return if we fail to acquire the lock.
    15821582     */
    1583     DECLCALLBACKMEMBER(int,   pfnLock)(PPDMDEVINS pDevIns, int rc);
     1583    DECLCALLBACKMEMBER(int, pfnLock,(PPDMDEVINS pDevIns, int rc));
    15841584
    15851585    /**
    … …  
    15881588     * @param   pDevIns         The PIC device instance.
    15891589     */
    1590     DECLCALLBACKMEMBER(void,  pfnUnlock)(PPDMDEVINS pDevIns);
     1590    DECLCALLBACKMEMBER(void, pfnUnlock,(PPDMDEVINS pDevIns));
    15911591
    15921592    /** Just a safety precaution. */
    … …  
    17161716     *          Actually, as per 2018-07-21 this isn't true (bird).
    17171717     */
    1718     DECLCALLBACKMEMBER(void, pfnSetIrq)(PPDMDEVINS pDevIns, PCIBDF uBusDevFn, int iIrq, int iLevel, uint32_t uTagSrc);
     1718    DECLCALLBACKMEMBER(void, pfnSetIrq,(PPDMDEVINS pDevIns, PCIBDF uBusDevFn, int iIrq, int iLevel, uint32_t uTagSrc));
    17191719
    17201720    /**
    … …  
    17301730     *          Actually, as per 2018-07-21 this isn't true (bird).
    17311731     */
    1732     DECLCALLBACKMEMBER(void, pfnSendMsi)(PPDMDEVINS pDevIns, PCIBDF uBusDevFn, PCMSIMSG pMsi, uint32_t uTagSrc);
     1732    DECLCALLBACKMEMBER(void, pfnSendMsi,(PPDMDEVINS pDevIns, PCIBDF uBusDevFn, PCMSIMSG pMsi, uint32_t uTagSrc));
    17331733
    17341734    /**
    … …  
    17451745     *          Actually, as per 2018-07-21 this isn't true (bird).
    17461746     */
    1747     DECLCALLBACKMEMBER(VBOXSTRICTRC, pfnSetEoi)(PPDMDEVINS pDevIns, uint8_t u8Vector);
     1747    DECLCALLBACKMEMBER(VBOXSTRICTRC, pfnSetEoi,(PPDMDEVINS pDevIns, uint8_t u8Vector));
    17481748
    17491749    /** Just a safety precaution. */
    … …  
    17801780     * @sa      APICBusDeliver()
    17811781     */
    1782     DECLCALLBACKMEMBER(int, pfnApicBusDeliver)(PPDMDEVINS pDevIns, uint8_t u8Dest, uint8_t u8DestMode, uint8_t u8DeliveryMode,
    1783                                                uint8_t uVector, uint8_t u8Polarity, uint8_t u8TriggerMode, uint32_t uTagSrc);
     1782    DECLCALLBACKMEMBER(int, pfnApicBusDeliver,(PPDMDEVINS pDevIns, uint8_t u8Dest, uint8_t u8DestMode, uint8_t u8DeliveryMode,
     1783                                               uint8_t uVector, uint8_t u8Polarity, uint8_t u8TriggerMode, uint32_t uTagSrc));
    17841784
    17851785    /**
    … …  
    17911791     * @param   rc              What to return if we fail to acquire the lock.
    17921792     */
    1793     DECLCALLBACKMEMBER(int,   pfnLock)(PPDMDEVINS pDevIns, int rc);
     1793    DECLCALLBACKMEMBER(int, pfnLock,(PPDMDEVINS pDevIns, int rc));
    17941794
    17951795    /**
    … …  
    17981798     * @param   pDevIns         The IOAPIC device instance.
    17991799     */
    1800     DECLCALLBACKMEMBER(void,  pfnUnlock)(PPDMDEVINS pDevIns);
     1800    DECLCALLBACKMEMBER(void, pfnUnlock,(PPDMDEVINS pDevIns));
    18011801
    18021802    /**
    … …  
    18111811     * @sa      iommuAmdDeviceMsiRemap().
    18121812     */
    1813     DECLCALLBACKMEMBER(int, pfnIommuMsiRemap)(PPDMDEVINS pDevIns, uint16_t uDevIt, PCMSIMSG pMsiIn, PMSIMSG pMsiOut);
     1813    DECLCALLBACKMEMBER(int, pfnIommuMsiRemap,(PPDMDEVINS pDevIns, uint16_t uDevIt, PCMSIMSG pMsiIn, PMSIMSG pMsiOut));
    18141814
    18151815    /** Just a safety precaution. */
    … …  
    20372037 * @remarks The device lock is not taken, however, the DMA device lock is held.
    20382038 */
    2039 typedef DECLCALLBACK(uint32_t) FNDMATRANSFERHANDLER(PPDMDEVINS pDevIns, void *pvUser, unsigned uChannel, uint32_t off, uint32_t cb);
     2039typedef DECLCALLBACKTYPE(uint32_t, FNDMATRANSFERHANDLER,(PPDMDEVINS pDevIns, void *pvUser, unsigned uChannel,
     2040                                                         uint32_t off, uint32_t cb));
    20402041/** Pointer to a FNDMATRANSFERHANDLER(). */
    20412042typedef FNDMATRANSFERHANDLER *PFNDMATRANSFERHANDLER;
    … …  
    82178218 * @param   u32Version      VBox version number.
    82188219 */
    8219 typedef DECLCALLBACK(int) FNPDMVBOXDEVICESREGISTER(PPDMDEVREGCB pCallbacks, uint32_t u32Version);
     8220typedef DECLCALLBACKTYPE(int, FNPDMVBOXDEVICESREGISTER,(PPDMDEVREGCB pCallbacks, uint32_t u32Version));
    82208221
    82218222/** @} */

  • trunk/include/VBox/vmm/pdmdrv.h

    r82968 r85121  
    7575 * @param   fFlags      Flags, combination of the PDM_TACH_FLAGS_* \#defines.
    7676 */
    77 typedef DECLCALLBACK(int)   FNPDMDRVCONSTRUCT(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags);
     77typedef DECLCALLBACKTYPE(int, FNPDMDRVCONSTRUCT,(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags));
    7878/** Pointer to a FNPDMDRVCONSTRUCT() function. */
    7979typedef FNPDMDRVCONSTRUCT *PFNPDMDRVCONSTRUCT;
    … …  
    8787 * @param   pDrvIns     The driver instance data.
    8888 */
    89 typedef DECLCALLBACK(void)   FNPDMDRVDESTRUCT(PPDMDRVINS pDrvIns);
     89typedef DECLCALLBACKTYPE(void, FNPDMDRVDESTRUCT,(PPDMDRVINS pDrvIns));
    9090/** Pointer to a FNPDMDRVDESTRUCT() function. */
    9191typedef FNPDMDRVDESTRUCT *PFNPDMDRVDESTRUCT;
    … …  
    107107 * @remark  A relocation CANNOT fail.
    108108 */
    109 typedef DECLCALLBACK(void) FNPDMDRVRELOCATE(PPDMDRVINS pDrvIns, RTGCINTPTR offDelta);
     109typedef DECLCALLBACKTYPE(void, FNPDMDRVRELOCATE,(PPDMDRVINS pDrvIns, RTGCINTPTR offDelta));
    110110/** Pointer to a FNPDMDRVRELOCATE() function. */
    111111typedef FNPDMDRVRELOCATE *PFNPDMDRVRELOCATE;
    … …  
    127127 * @param   pcbOut      Where to store the actual size of the output data.
    128128 */
    129 typedef DECLCALLBACK(int) FNPDMDRVIOCTL(PPDMDRVINS pDrvIns, uint32_t uFunction,
    130                                         void *pvIn, uint32_t cbIn,
    131                                         void *pvOut, uint32_t cbOut, uint32_t *pcbOut);
     129typedef DECLCALLBACKTYPE(int, FNPDMDRVIOCTL,(PPDMDRVINS pDrvIns, uint32_t uFunction,
     130                                             void *pvIn, uint32_t cbIn,
     131                                             void *pvOut, uint32_t cbOut, uint32_t *pcbOut));
    132132/** Pointer to a FNPDMDRVIOCTL() function. */
    133133typedef FNPDMDRVIOCTL *PFNPDMDRVIOCTL;
    … …  
    138138 * @param   pDrvIns     The driver instance data.
    139139 */
    140 typedef DECLCALLBACK(void)   FNPDMDRVPOWERON(PPDMDRVINS pDrvIns);
     140typedef DECLCALLBACKTYPE(void, FNPDMDRVPOWERON,(PPDMDRVINS pDrvIns));
    141141/** Pointer to a FNPDMDRVPOWERON() function. */
    142142typedef FNPDMDRVPOWERON *PFNPDMDRVPOWERON;
    … …  
    148148 * @param   pDrvIns     The driver instance data.
    149149 */
    150 typedef DECLCALLBACK(void)  FNPDMDRVRESET(PPDMDRVINS pDrvIns);
     150typedef DECLCALLBACKTYPE(void, FNPDMDRVRESET,(PPDMDRVINS pDrvIns));
    151151/** Pointer to a FNPDMDRVRESET() function. */
    152152typedef FNPDMDRVRESET *PFNPDMDRVRESET;
    … …  
    158158 * @param   pDrvIns     The driver instance data.
    159159 */
    160 typedef DECLCALLBACK(void)  FNPDMDRVSUSPEND(PPDMDRVINS pDrvIns);
     160typedef DECLCALLBACKTYPE(void, FNPDMDRVSUSPEND,(PPDMDRVINS pDrvIns));
    161161/** Pointer to a FNPDMDRVSUSPEND() function. */
    162162typedef FNPDMDRVSUSPEND *PFNPDMDRVSUSPEND;
    … …  
    168168 * @param   pDrvIns     The driver instance data.
    169169 */
    170 typedef DECLCALLBACK(void)  FNPDMDRVRESUME(PPDMDRVINS pDrvIns);
     170typedef DECLCALLBACKTYPE(void, FNPDMDRVRESUME,(PPDMDRVINS pDrvIns));
    171171/** Pointer to a FNPDMDRVRESUME() function. */
    172172typedef FNPDMDRVRESUME *PFNPDMDRVRESUME;
    … …  
    181181 * @param   pDrvIns     The driver instance data.
    182182 */
    183 typedef DECLCALLBACK(void)   FNPDMDRVPOWEROFF(PPDMDRVINS pDrvIns);
     183typedef DECLCALLBACKTYPE(void, FNPDMDRVPOWEROFF,(PPDMDRVINS pDrvIns));
    184184/** Pointer to a FNPDMDRVPOWEROFF() function. */
    185185typedef FNPDMDRVPOWEROFF *PFNPDMDRVPOWEROFF;
    … …  
    198198 * @param   fFlags      Flags, combination of the PDM_TACH_FLAGS_* \#defines.
    199199 */
    200 typedef DECLCALLBACK(int)  FNPDMDRVATTACH(PPDMDRVINS pDrvIns, uint32_t fFlags);
     200typedef DECLCALLBACKTYPE(int, FNPDMDRVATTACH,(PPDMDRVINS pDrvIns, uint32_t fFlags));
    201201/** Pointer to a FNPDMDRVATTACH() function. */
    202202typedef FNPDMDRVATTACH *PFNPDMDRVATTACH;
    … …  
    213213 * @param   fFlags      PDM_TACH_FLAGS_NOT_HOT_PLUG or 0.
    214214 */
    215 typedef DECLCALLBACK(void)  FNPDMDRVDETACH(PPDMDRVINS pDrvIns, uint32_t fFlags);
     215typedef DECLCALLBACKTYPE(void, FNPDMDRVDETACH,(PPDMDRVINS pDrvIns, uint32_t fFlags));
    216216/** Pointer to a FNPDMDRVDETACH() function. */
    217217typedef FNPDMDRVDETACH *PFNPDMDRVDETACH;
    … …  
    18641864 * @param   u32Version      VBox version number.
    18651865 */
    1866 typedef DECLCALLBACK(int) FNPDMVBOXDRIVERSREGISTER(PCPDMDRVREGCB pCallbacks, uint32_t u32Version);
     1866typedef DECLCALLBACKTYPE(int, FNPDMVBOXDRIVERSREGISTER,(PCPDMDRVREGCB pCallbacks, uint32_t u32Version));
    18671867
    18681868VMMR3DECL(int) PDMR3DrvStaticRegistration(PVM pVM, FNPDMVBOXDRIVERSREGISTER pfnCallback);

  • trunk/include/VBox/vmm/pdmpcidev.h

    r84509 r85121  
    5656 *          that is very likely be a lock order violation.
    5757 */
    58 typedef DECLCALLBACK(VBOXSTRICTRC) FNPCICONFIGREAD(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev,
    59                                                    uint32_t uAddress, unsigned cb, uint32_t *pu32Value);
     58typedef DECLCALLBACKTYPE(VBOXSTRICTRC, FNPCICONFIGREAD,(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev,
     59                                                        uint32_t uAddress, unsigned cb, uint32_t *pu32Value));
    6060/** Pointer to a FNPCICONFIGREAD() function. */
    6161typedef FNPCICONFIGREAD *PFNPCICONFIGREAD;
    … …  
    8181 *          that is very likely be a lock order violation.
    8282 */
    83 typedef DECLCALLBACK(VBOXSTRICTRC) FNPCICONFIGWRITE(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev,
    84                                                     uint32_t uAddress, unsigned cb, uint32_t u32Value);
     83typedef DECLCALLBACKTYPE(VBOXSTRICTRC, FNPCICONFIGWRITE,(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev,
     84                                                         uint32_t uAddress, unsigned cb, uint32_t u32Value));
    8585/** Pointer to a FNPCICONFIGWRITE() function. */
    8686typedef FNPCICONFIGWRITE *PFNPCICONFIGWRITE;
    … …  
    123123 *          that is very likely be a lock order violation.
    124124 */
    125 typedef DECLCALLBACK(int) FNPCIIOREGIONMAP(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev, uint32_t iRegion,
    126                                            RTGCPHYS GCPhysAddress, RTGCPHYS cb, PCIADDRESSSPACE enmType);
     125typedef DECLCALLBACKTYPE(int, FNPCIIOREGIONMAP,(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev, uint32_t iRegion,
     126                                                RTGCPHYS GCPhysAddress, RTGCPHYS cb, PCIADDRESSSPACE enmType));
    127127/** Pointer to a FNPCIIOREGIONMAP() function. */
    128128typedef FNPCIIOREGIONMAP *PFNPCIIOREGIONMAP;
    … …  
    139139 * @param   enmType         Combination of the PCI_ADDRESS_SPACE_* values.
    140140 */
    141 typedef DECLCALLBACK(int) FNPCIIOREGIONOLDSETTER(PPDMPCIDEV pPciDev, uint32_t iRegion, RTGCPHYS cbRegion, PCIADDRESSSPACE enmType);
     141typedef DECLCALLBACKTYPE(int, FNPCIIOREGIONOLDSETTER,(PPDMPCIDEV pPciDev, uint32_t iRegion, RTGCPHYS cbRegion,
     142                                                      PCIADDRESSSPACE enmType));
    142143/** Pointer to a FNPCIIOREGIONOLDSETTER() function. */
    143144typedef FNPCIIOREGIONOLDSETTER *PFNPCIIOREGIONOLDSETTER;
    … …  
    153154 * @sa      @bugref{9359}
    154155 */
    155 typedef DECLCALLBACK(int) FNPCIIOREGIONSWAP(PPDMPCIDEV pPciDev, uint32_t iRegion, uint32_t iOtherRegion);
     156typedef DECLCALLBACKTYPE(int, FNPCIIOREGIONSWAP,(PPDMPCIDEV pPciDev, uint32_t iRegion, uint32_t iOtherRegion));
    156157/** Pointer to a FNPCIIOREGIONSWAP() function. */
    157158typedef FNPCIIOREGIONSWAP *PFNPCIIOREGIONSWAP;

  • trunk/include/VBox/vmm/pdmpcidevint.h

    r82968 r85121  
    8383 * @param   pu32Value       Where to return the register value.
    8484 */
    85 typedef DECLCALLBACK(VBOXSTRICTRC) FNPCIBRIDGECONFIGREAD(PPDMDEVINSR3 pDevIns, uint8_t iBus, uint8_t iDevice,
    86                                                          uint32_t u32Address, unsigned cb, uint32_t *pu32Value);
     85typedef DECLCALLBACKTYPE(VBOXSTRICTRC, FNPCIBRIDGECONFIGREAD,(PPDMDEVINSR3 pDevIns, uint8_t iBus, uint8_t iDevice,
     86                                                              uint32_t u32Address, unsigned cb, uint32_t *pu32Value));
    8787/** Pointer to a FNPCICONFIGREAD() function. */
    8888typedef FNPCIBRIDGECONFIGREAD *PFNPCIBRIDGECONFIGREAD;
    … …  
    102102 *                          this value is determined by the cb parameter.
    103103 */
    104 typedef DECLCALLBACK(VBOXSTRICTRC) FNPCIBRIDGECONFIGWRITE(PPDMDEVINSR3 pDevIns, uint8_t iBus, uint8_t iDevice,
    105                                                           uint32_t u32Address, unsigned cb, uint32_t u32Value);
     104typedef DECLCALLBACKTYPE(VBOXSTRICTRC, FNPCIBRIDGECONFIGWRITE,(PPDMDEVINSR3 pDevIns, uint8_t iBus, uint8_t iDevice,
     105                                                               uint32_t u32Address, unsigned cb, uint32_t u32Value));
    106106/** Pointer to a FNPCICONFIGWRITE() function. */
    107107typedef FNPCIBRIDGECONFIGWRITE *PFNPCIBRIDGECONFIGWRITE;

  • trunk/include/VBox/vmm/pdmqueue.h

    r82968 r85121  
    7878 *          that only one EMT will do queue callbacks at any one time.
    7979 */
    80 typedef DECLCALLBACK(bool) FNPDMQUEUEDEV(PPDMDEVINS pDevIns, PPDMQUEUEITEMCORE pItem);
     80typedef DECLCALLBACKTYPE(bool, FNPDMQUEUEDEV,(PPDMDEVINS pDevIns, PPDMQUEUEITEMCORE pItem));
    8181/** Pointer to a FNPDMQUEUEDEV(). */
    8282typedef FNPDMQUEUEDEV *PFNPDMQUEUEDEV;
    … …  
    9292 *          EMT will do queue callbacks at any one time.
    9393 */
    94 typedef DECLCALLBACK(bool) FNPDMQUEUEUSB(PPDMUSBINS pUsbIns, PPDMQUEUEITEMCORE pItem);
     94typedef DECLCALLBACKTYPE(bool, FNPDMQUEUEUSB,(PPDMUSBINS pUsbIns, PPDMQUEUEITEMCORE pItem));
    9595/** Pointer to a FNPDMQUEUEUSB(). */
    9696typedef FNPDMQUEUEUSB *PFNPDMQUEUEUSB;
    … …  
    106106 *          EMT will do queue callbacks at any one time.
    107107 */
    108 typedef DECLCALLBACK(bool) FNPDMQUEUEDRV(PPDMDRVINS pDrvIns, PPDMQUEUEITEMCORE pItem);
     108typedef DECLCALLBACKTYPE(bool, FNPDMQUEUEDRV,(PPDMDRVINS pDrvIns, PPDMQUEUEITEMCORE pItem));
    109109/** Pointer to a FNPDMQUEUEDRV(). */
    110110typedef FNPDMQUEUEDRV *PFNPDMQUEUEDRV;
    … …  
    120120 *          EMT will do queue callbacks at any one time.
    121121 */
    122 typedef DECLCALLBACK(bool) FNPDMQUEUEINT(PVM pVM, PPDMQUEUEITEMCORE pItem);
     122typedef DECLCALLBACKTYPE(bool, FNPDMQUEUEINT,(PVM pVM, PPDMQUEUEITEMCORE pItem));
    123123/** Pointer to a FNPDMQUEUEINT(). */
    124124typedef FNPDMQUEUEINT *PFNPDMQUEUEINT;
    … …  
    134134 *          EMT will do queue callbacks at any one time.
    135135 */
    136 typedef DECLCALLBACK(bool) FNPDMQUEUEEXT(void *pvUser, PPDMQUEUEITEMCORE pItem);
     136typedef DECLCALLBACKTYPE(bool, FNPDMQUEUEEXT,(void *pvUser, PPDMQUEUEITEMCORE pItem));
    137137/** Pointer to a FNPDMQUEUEEXT(). */
    138138typedef FNPDMQUEUEEXT *PFNPDMQUEUEEXT;

  • trunk/include/VBox/vmm/pdmsrv.h

    r82968 r85121  
    5353 *                      usage is expected in this function it is passed as a parameter.
    5454 */
    55 typedef DECLCALLBACK(int)   FNPDMSRVCONSTRUCT(PPDMSRVINS pSrvIns, PCFGMNODE pCfg);
     55typedef DECLCALLBACKTYPE(int, FNPDMSRVCONSTRUCT,(PPDMSRVINS pSrvIns, PCFGMNODE pCfg));
    5656/** Pointer to a FNPDMSRVCONSTRUCT() function. */
    5757typedef FNPDMSRVCONSTRUCT *PFNPDMSRVCONSTRUCT;
    … …  
    6565 * @param   pSrvIns     The service instance data.
    6666 */
    67 typedef DECLCALLBACK(void)   FNPDMSRVDESTRUCT(PPDMSRVINS pSrvIns);
     67typedef DECLCALLBACKTYPE(void, FNPDMSRVDESTRUCT,(PPDMSRVINS pSrvIns));
    6868/** Pointer to a FNPDMSRVDESTRUCT() function. */
    6969typedef FNPDMSRVDESTRUCT *PFNPDMSRVDESTRUCT;
    … …  
    7474 * @param   pSrvIns     The service instance data.
    7575 */
    76 typedef DECLCALLBACK(void)   FNPDMSRVPOWERON(PPDMSRVINS pSrvIns);
     76typedef DECLCALLBACKTYPE(void, FNPDMSRVPOWERON,(PPDMSRVINS pSrvIns));
    7777/** Pointer to a FNPDMSRVPOWERON() function. */
    7878typedef FNPDMSRVPOWERON *PFNPDMSRVPOWERON;
    … …  
    8484 * @param   pSrvIns     The service instance data.
    8585 */
    86 typedef DECLCALLBACK(void)  FNPDMSRVRESET(PPDMSRVINS pSrvIns);
     86typedef DECLCALLBACKTYPE(void, FNPDMSRVRESET,(PPDMSRVINS pSrvIns));
    8787/** Pointer to a FNPDMSRVRESET() function. */
    8888typedef FNPDMSRVRESET *PFNPDMSRVRESET;
    … …  
    9494 * @param   pSrvIns     The service instance data.
    9595 */
    96 typedef DECLCALLBACK(void)  FNPDMSRVSUSPEND(PPDMSRVINS pSrvIns);
     96typedef DECLCALLBACKTYPE(void, FNPDMSRVSUSPEND,(PPDMSRVINS pSrvIns));
    9797/** Pointer to a FNPDMSRVSUSPEND() function. */
    9898typedef FNPDMSRVSUSPEND *PFNPDMSRVSUSPEND;
    … …  
    104104 * @param   pSrvIns     The service instance data.
    105105 */
    106 typedef DECLCALLBACK(void)  FNPDMSRVRESUME(PPDMSRVINS pSrvIns);
     106typedef DECLCALLBACKTYPE(void, FNPDMSRVRESUME,(PPDMSRVINS pSrvIns));
    107107/** Pointer to a FNPDMSRVRESUME() function. */
    108108typedef FNPDMSRVRESUME *PFNPDMSRVRESUME;
    … …  
    113113 * @param   pSrvIns     The service instance data.
    114114 */
    115 typedef DECLCALLBACK(void)   FNPDMSRVPOWEROFF(PPDMSRVINS pSrvIns);
     115typedef DECLCALLBACKTYPE(void, FNPDMSRVPOWEROFF,(PPDMSRVINS pSrvIns));
    116116/** Pointer to a FNPDMSRVPOWEROFF() function. */
    117117typedef FNPDMSRVPOWEROFF *PFNPDMSRVPOWEROFF;
    … …  
    124124 * @param   pSrvIns     The service instance data.
    125125 */
    126 typedef DECLCALLBACK(void)  FNPDMSRVDETACH(PPDMSRVINS pSrvIns, PPDMDEVINS pDevIns, PPDMDRVINS pDrvIns);
     126typedef DECLCALLBACKTYPE(void, FNPDMSRVDETACH,(PPDMSRVINS pSrvIns, PPDMDEVINS pDevIns, PPDMDRVINS pDrvIns));
    127127/** Pointer to a FNPDMSRVDETACH() function. */
    128128typedef FNPDMSRVDETACH *PFNPDMSRVDETACH;
    … …  
    329329 * @param   u32Version      VBox version number.
    330330 */
    331 typedef DECLCALLBACK(int) FNPDMVBOXSERVICESREGISTER(PPDMSRVREGCB pCallbacks, uint32_t u32Version);
     331typedef DECLCALLBACKTYPE(int, FNPDMVBOXSERVICESREGISTER,(PPDMSRVREGCB pCallbacks, uint32_t u32Version));
    332332
    333333

  • trunk/include/VBox/vmm/pdmstorageifs.h

    r82968 r85121  
    144144 * @param   uPercent        Completion percentage.
    145145 */
    146 typedef DECLCALLBACK(int) FNSIMPLEPROGRESS(void *pvUser, unsigned uPercentage);
     146typedef DECLCALLBACKTYPE(int, FNSIMPLEPROGRESS,(void *pvUser, unsigned uPercentage));
    147147/** Pointer to FNSIMPLEPROGRESS() */
    148148typedef FNSIMPLEPROGRESS *PFNSIMPLEPROGRESS;

  • trunk/include/VBox/vmm/pdmtask.h

    r82968 r85121  
    5858 *          callback.  No other locks will be held either.
    5959 */
    60 typedef DECLCALLBACK(void) FNPDMTASKDEV(PPDMDEVINS pDevIns, void *pvUser);
     60typedef DECLCALLBACKTYPE(void, FNPDMTASKDEV,(PPDMDEVINS pDevIns, void *pvUser));
    6161/** Pointer to a FNPDMTASKDEV(). */
    6262typedef FNPDMTASKDEV *PFNPDMTASKDEV;
    … …  
    7070 * @remarks No other locks will be held.
    7171 */
    72 typedef DECLCALLBACK(void) FNPDMTASKDRV(PPDMDRVINS pDrvIns, void *pvUser);
     72typedef DECLCALLBACKTYPE(void, FNPDMTASKDRV,(PPDMDRVINS pDrvIns, void *pvUser));
    7373/** Pointer to a FNPDMTASKDRV(). */
    7474typedef FNPDMTASKDRV *PFNPDMTASKDRV;
    … …  
    8282 * @remarks No other locks will be held.
    8383 */
    84 typedef DECLCALLBACK(void) FNPDMTASKUSB(PPDMUSBINS pUsbIns, void *pvUser);
     84typedef DECLCALLBACKTYPE(void, FNPDMTASKUSB,(PPDMUSBINS pUsbIns, void *pvUser));
    8585/** Pointer to a FNPDMTASKUSB(). */
    8686typedef FNPDMTASKUSB *PFNPDMTASKUSB;
    … …  
    9494 * @remarks No other locks will be held.
    9595 */
    96 typedef DECLCALLBACK(void) FNPDMTASKINT(PVM pVM, void *pvUser);
     96typedef DECLCALLBACKTYPE(void, FNPDMTASKINT,(PVM pVM, void *pvUser));
    9797/** Pointer to a FNPDMTASKINT(). */
    9898typedef FNPDMTASKINT *PFNPDMTASKINT;

  • trunk/include/VBox/vmm/pdmthread.h

    r82968 r85121  
    9494 * @param   pThread     The PDM thread data.
    9595 */
    96 typedef DECLCALLBACK(int) FNPDMTHREADDEV(PPDMDEVINS pDevIns, PPDMTHREAD pThread);
     96typedef DECLCALLBACKTYPE(int, FNPDMTHREADDEV,(PPDMDEVINS pDevIns, PPDMTHREAD pThread));
    9797/** Pointer to a FNPDMTHREADDEV(). */
    9898typedef FNPDMTHREADDEV *PFNPDMTHREADDEV;
    … …  
    105105 * @param   pThread     The PDM thread data.
    106106 */
    107 typedef DECLCALLBACK(int) FNPDMTHREADUSB(PPDMUSBINS pUsbIns, PPDMTHREAD pThread);
     107typedef DECLCALLBACKTYPE(int, FNPDMTHREADUSB,(PPDMUSBINS pUsbIns, PPDMTHREAD pThread));
    108108/** Pointer to a FNPDMTHREADUSB(). */
    109109typedef FNPDMTHREADUSB *PFNPDMTHREADUSB;
    … …  
    116116 * @param   pThread     The PDM thread data.
    117117 */
    118 typedef DECLCALLBACK(int) FNPDMTHREADDRV(PPDMDRVINS pDrvIns, PPDMTHREAD pThread);
     118typedef DECLCALLBACKTYPE(int, FNPDMTHREADDRV,(PPDMDRVINS pDrvIns, PPDMTHREAD pThread));
    119119/** Pointer to a FNPDMTHREADDRV(). */
    120120typedef FNPDMTHREADDRV *PFNPDMTHREADDRV;
    … …  
    127127 * @param   pThread     The PDM thread data.
    128128 */
    129 typedef DECLCALLBACK(int) FNPDMTHREADINT(PVM pVM, PPDMTHREAD pThread);
     129typedef DECLCALLBACKTYPE(int, FNPDMTHREADINT,(PVM pVM, PPDMTHREAD pThread));
    130130/** Pointer to a FNPDMTHREADINT(). */
    131131typedef FNPDMTHREADINT *PFNPDMTHREADINT;
    … …  
    150150 * @param   pThread     The PDM thread data.
    151151 */
    152 typedef DECLCALLBACK(int) FNPDMTHREADWAKEUPDEV(PPDMDEVINS pDevIns, PPDMTHREAD pThread);
     152typedef DECLCALLBACKTYPE(int, FNPDMTHREADWAKEUPDEV,(PPDMDEVINS pDevIns, PPDMTHREAD pThread));
    153153/** Pointer to a FNPDMTHREADDEV(). */
    154154typedef FNPDMTHREADWAKEUPDEV *PFNPDMTHREADWAKEUPDEV;
    … …  
    161161 * @param   pThread     The PDM thread data.
    162162 */
    163 typedef DECLCALLBACK(int) FNPDMTHREADWAKEUPUSB(PPDMUSBINS pUsbIns, PPDMTHREAD pThread);
     163typedef DECLCALLBACKTYPE(int, FNPDMTHREADWAKEUPUSB,(PPDMUSBINS pUsbIns, PPDMTHREAD pThread));
    164164/** Pointer to a FNPDMTHREADUSB(). */
    165165typedef FNPDMTHREADWAKEUPUSB *PFNPDMTHREADWAKEUPUSB;
    … …  
    172172 * @param   pThread     The PDM thread data.
    173173 */
    174 typedef DECLCALLBACK(int) FNPDMTHREADWAKEUPDRV(PPDMDRVINS pDrvIns, PPDMTHREAD pThread);
     174typedef DECLCALLBACKTYPE(int, FNPDMTHREADWAKEUPDRV,(PPDMDRVINS pDrvIns, PPDMTHREAD pThread));
    175175/** Pointer to a FNPDMTHREADDRV(). */
    176176typedef FNPDMTHREADWAKEUPDRV *PFNPDMTHREADWAKEUPDRV;
    … …  
    183183 * @param   pThread     The PDM thread data.
    184184 */
    185 typedef DECLCALLBACK(int) FNPDMTHREADWAKEUPINT(PVM pVM, PPDMTHREAD pThread);
     185typedef DECLCALLBACKTYPE(int, FNPDMTHREADWAKEUPINT,(PVM pVM, PPDMTHREAD pThread));
    186186/** Pointer to a FNPDMTHREADWAKEUPINT(). */
    187187typedef FNPDMTHREADWAKEUPINT *PFNPDMTHREADWAKEUPINT;

  • trunk/include/VBox/vmm/pdmusb.h

    r82968 r85121  
    10731073 * @param   u32Version      VBox version number.
    10741074 */
    1075 typedef DECLCALLBACK(int) FNPDMVBOXUSBREGISTER(PCPDMUSBREGCB pCallbacks, uint32_t u32Version);
     1075typedef DECLCALLBACKTYPE(int, FNPDMVBOXUSBREGISTER,(PCPDMUSBREGCB pCallbacks, uint32_t u32Version));
    10761076
    10771077VMMR3DECL(int)  PDMR3UsbCreateEmulatedDevice(PUVM pUVM, const char *pszDeviceName, PCFGMNODE pDeviceNode, PCRTUUID pUuid,

  • trunk/include/VBox/vmm/pgm.h

    r82968 r85121  
    8181 *          indicator. Relocation can not fail!
    8282 */
    83 typedef DECLCALLBACK(bool) FNPGMRELOCATE(PVM pVM, RTGCPTR GCPtrOld, RTGCPTR GCPtrNew, PGMRELOCATECALL enmMode, void *pvUser);
     83typedef DECLCALLBACKTYPE(bool, FNPGMRELOCATE,(PVM pVM, RTGCPTR GCPtrOld, RTGCPTR GCPtrNew, PGMRELOCATECALL enmMode, void *pvUser));
    8484/** Pointer to a relocation callback function. */
    8585typedef FNPGMRELOCATE *PFNPGMRELOCATE;
    … …  
    203203 * @thread  EMT(pVCpu)
    204204 */
    205 typedef DECLCALLBACK(VBOXSTRICTRC) FNPGMRZPHYSPFHANDLER(PVMCC pVM, PVMCPUCC pVCpu, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame,
    206                                                         RTGCPTR pvFault, RTGCPHYS GCPhysFault, void *pvUser);
     205typedef DECLCALLBACKTYPE(VBOXSTRICTRC, FNPGMRZPHYSPFHANDLER,(PVMCC pVM, PVMCPUCC pVCpu, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame,
     206                                                             RTGCPTR pvFault, RTGCPHYS GCPhysFault, void *pvUser));
    207207/** Pointer to PGM access callback. */
    208208typedef FNPGMRZPHYSPFHANDLER *PFNPGMRZPHYSPFHANDLER;
    … …  
    234234 * @thread  EMT(pVCpu)
    235235 */
    236 typedef DECLCALLBACK(VBOXSTRICTRC) FNPGMPHYSHANDLER(PVMCC pVM, PVMCPUCC pVCpu, RTGCPHYS GCPhys, void *pvPhys, void *pvBuf, size_t cbBuf,
    237                                                     PGMACCESSTYPE enmAccessType, PGMACCESSORIGIN enmOrigin, void *pvUser);
     236typedef DECLCALLBACKTYPE(VBOXSTRICTRC, FNPGMPHYSHANDLER,(PVMCC pVM, PVMCPUCC pVCpu, RTGCPHYS GCPhys, void *pvPhys,
     237                                                         void *pvBuf, size_t cbBuf, PGMACCESSTYPE enmAccessType,
     238                                                         PGMACCESSORIGIN enmOrigin, void *pvUser));
    238239/** Pointer to PGM access callback. */
    239240typedef FNPGMPHYSHANDLER *PFNPGMPHYSHANDLER;
    … …  
    611612 * @param   pvUser      Callback user argument.
    612613 */
    613 typedef DECLCALLBACK(int) FNPGMPHYSNEMCHECKPAGE(PVMCC pVM, PVMCPUCC pVCpu, RTGCPHYS GCPhys, PPGMPHYSNEMPAGEINFO pInfo, void *pvUser);
     614typedef DECLCALLBACKTYPE(int, FNPGMPHYSNEMCHECKPAGE,(PVMCC pVM, PVMCPUCC pVCpu, RTGCPHYS GCPhys, PPGMPHYSNEMPAGEINFO pInfo, void *pvUser));
    614615/** Pointer to a FNPGMPHYSNEMCHECKPAGE function. */
    615616typedef FNPGMPHYSNEMCHECKPAGE *PFNPGMPHYSNEMCHECKPAGE;
    … …  
    630631 * @param   pvUser      The user argument.
    631632 */
    632 typedef DECLCALLBACK(int) FNPGMPHYSNEMENUMCALLBACK(PVMCC pVM, PVMCPUCC pVCpu, RTGCPHYS GCPhys, uint8_t *pu2NemState, void *pvUser);
     633typedef DECLCALLBACKTYPE(int, FNPGMPHYSNEMENUMCALLBACK,(PVMCC pVM, PVMCPUCC pVCpu, RTGCPHYS GCPhys,
     634                                                        uint8_t *pu2NemState, void *pvUser));
    633635/** Pointer to a FNPGMPHYSNEMENUMCALLBACK function. */
    634636typedef FNPGMPHYSNEMENUMCALLBACK *PFNPGMPHYSNEMENUMCALLBACK;

  • trunk/include/VBox/vmm/ssm.h

    r83776 r85121  
    117117 *                          SSMR3PutStructEx.
    118118 */
    119 typedef DECLCALLBACK(int) FNSSMFIELDGETPUT(PSSMHANDLE pSSM, const struct SSMFIELD *pField, void *pvStruct,
    120                                            uint32_t fFlags, bool fGetOrPut, void *pvUser);
     119typedef DECLCALLBACKTYPE(int, FNSSMFIELDGETPUT,(PSSMHANDLE pSSM, const struct SSMFIELD *pField, void *pvStruct,
     120                                                uint32_t fFlags, bool fGetOrPut, void *pvUser));
    121121/** Pointer to a SSMFIELD Get/Put callback. */
    122122typedef FNSSMFIELDGETPUT *PFNSSMFIELDGETPUT;
    … …  
    422422 * @thread  Any.
    423423 */
    424 typedef DECLCALLBACK(int) FNSSMDEVLIVEPREP(PPDMDEVINS pDevIns, PSSMHANDLE pSSM);
     424typedef DECLCALLBACKTYPE(int, FNSSMDEVLIVEPREP,(PPDMDEVINS pDevIns, PSSMHANDLE pSSM));
    425425/** Pointer to a FNSSMDEVLIVEPREP() function. */
    426426typedef FNSSMDEVLIVEPREP *PFNSSMDEVLIVEPREP;
    … …  
    439439 * @thread  Any.
    440440 */
    441 typedef DECLCALLBACK(int) FNSSMDEVLIVEEXEC(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uPass);
     441typedef DECLCALLBACKTYPE(int, FNSSMDEVLIVEEXEC,(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uPass));
    442442/** Pointer to a FNSSMDEVLIVEEXEC() function. */
    443443typedef FNSSMDEVLIVEEXEC *PFNSSMDEVLIVEEXEC;
    … …  
    462462 * @thread  Any.
    463463 */
    464 typedef DECLCALLBACK(int) FNSSMDEVLIVEVOTE(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uPass);
     464typedef DECLCALLBACKTYPE(int, FNSSMDEVLIVEVOTE,(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uPass));
    465465/** Pointer to a FNSSMDEVLIVEVOTE() function. */
    466466typedef FNSSMDEVLIVEVOTE *PFNSSMDEVLIVEVOTE;
    … …  
    474474 * @remarks The caller enters the device critical section prior to the call.
    475475 */
    476 typedef DECLCALLBACK(int) FNSSMDEVSAVEPREP(PPDMDEVINS pDevIns, PSSMHANDLE pSSM);
     476typedef DECLCALLBACKTYPE(int, FNSSMDEVSAVEPREP,(PPDMDEVINS pDevIns, PSSMHANDLE pSSM));
    477477/** Pointer to a FNSSMDEVSAVEPREP() function. */
    478478typedef FNSSMDEVSAVEPREP *PFNSSMDEVSAVEPREP;
    … …  
    486486 * @remarks The caller enters the device critical section prior to the call.
    487487 */
    488 typedef DECLCALLBACK(int) FNSSMDEVSAVEEXEC(PPDMDEVINS pDevIns, PSSMHANDLE pSSM);
     488typedef DECLCALLBACKTYPE(int, FNSSMDEVSAVEEXEC,(PPDMDEVINS pDevIns, PSSMHANDLE pSSM));
    489489/** Pointer to a FNSSMDEVSAVEEXEC() function. */
    490490typedef FNSSMDEVSAVEEXEC *PFNSSMDEVSAVEEXEC;
    … …  
    498498 * @remarks The caller enters the device critical section prior to the call.
    499499 */
    500 typedef DECLCALLBACK(int) FNSSMDEVSAVEDONE(PPDMDEVINS pDevIns, PSSMHANDLE pSSM);
     500typedef DECLCALLBACKTYPE(int, FNSSMDEVSAVEDONE,(PPDMDEVINS pDevIns, PSSMHANDLE pSSM));
    501501/** Pointer to a FNSSMDEVSAVEDONE() function. */
    502502typedef FNSSMDEVSAVEDONE *PFNSSMDEVSAVEDONE;
    … …  
    510510 * @remarks The caller enters the device critical section prior to the call.
    511511 */
    512 typedef DECLCALLBACK(int) FNSSMDEVLOADPREP(PPDMDEVINS pDevIns, PSSMHANDLE pSSM);
     512typedef DECLCALLBACKTYPE(int, FNSSMDEVLOADPREP,(PPDMDEVINS pDevIns, PSSMHANDLE pSSM));
    513513/** Pointer to a FNSSMDEVLOADPREP() function. */
    514514typedef FNSSMDEVLOADPREP *PFNSSMDEVLOADPREP;
    … …  
    525525 * @remarks The caller enters the device critical section prior to the call.
    526526 */
    527 typedef DECLCALLBACK(int) FNSSMDEVLOADEXEC(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass);
     527typedef DECLCALLBACKTYPE(int, FNSSMDEVLOADEXEC,(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass));
    528528/** Pointer to a FNSSMDEVLOADEXEC() function. */
    529529typedef FNSSMDEVLOADEXEC *PFNSSMDEVLOADEXEC;
    … …  
    537537 * @remarks The caller enters the device critical section prior to the call.
    538538 */
    539 typedef DECLCALLBACK(int) FNSSMDEVLOADDONE(PPDMDEVINS pDevIns, PSSMHANDLE pSSM);
     539typedef DECLCALLBACKTYPE(int, FNSSMDEVLOADDONE,(PPDMDEVINS pDevIns, PSSMHANDLE pSSM));
    540540/** Pointer to a FNSSMDEVLOADDONE() function. */
    541541typedef FNSSMDEVLOADDONE *PFNSSMDEVLOADDONE;
    … …  
    557557 * @thread  Any.
    558558 */
    559 typedef DECLCALLBACK(int) FNSSMUSBLIVEPREP(PPDMUSBINS pUsbIns, PSSMHANDLE pSSM);
     559typedef DECLCALLBACKTYPE(int, FNSSMUSBLIVEPREP,(PPDMUSBINS pUsbIns, PSSMHANDLE pSSM));
    560560/** Pointer to a FNSSMUSBLIVEPREP() function. */
    561561typedef FNSSMUSBLIVEPREP *PFNSSMUSBLIVEPREP;
    … …  
    574574 * @thread  Any.
    575575 */
    576 typedef DECLCALLBACK(int) FNSSMUSBLIVEEXEC(PPDMUSBINS pUsbIns, PSSMHANDLE pSSM, uint32_t uPass);
     576typedef DECLCALLBACKTYPE(int, FNSSMUSBLIVEEXEC,(PPDMUSBINS pUsbIns, PSSMHANDLE pSSM, uint32_t uPass));
    577577/** Pointer to a FNSSMUSBLIVEEXEC() function. */
    578578typedef FNSSMUSBLIVEEXEC *PFNSSMUSBLIVEEXEC;
    … …  
    597597 * @thread  Any.
    598598 */
    599 typedef DECLCALLBACK(int) FNSSMUSBLIVEVOTE(PPDMUSBINS pUsbIns, PSSMHANDLE pSSM, uint32_t uPass);
     599typedef DECLCALLBACKTYPE(int, FNSSMUSBLIVEVOTE,(PPDMUSBINS pUsbIns, PSSMHANDLE pSSM, uint32_t uPass));
    600600/** Pointer to a FNSSMUSBLIVEVOTE() function. */
    601601typedef FNSSMUSBLIVEVOTE *PFNSSMUSBLIVEVOTE;
    … …  
    609609 * @param   pSSM            SSM operation handle.
    610610 */
    611 typedef DECLCALLBACK(int) FNSSMUSBSAVEPREP(PPDMUSBINS pUsbIns, PSSMHANDLE pSSM);
     611typedef DECLCALLBACKTYPE(int, FNSSMUSBSAVEPREP,(PPDMUSBINS pUsbIns, PSSMHANDLE pSSM));
    612612/** Pointer to a FNSSMUSBSAVEPREP() function. */
    613613typedef FNSSMUSBSAVEPREP *PFNSSMUSBSAVEPREP;
    … …  
    621621 * @param   pSSM            SSM operation handle.
    622622 */
    623 typedef DECLCALLBACK(int) FNSSMUSBSAVEEXEC(PPDMUSBINS pUsbIns, PSSMHANDLE pSSM);
     623typedef DECLCALLBACKTYPE(int, FNSSMUSBSAVEEXEC,(PPDMUSBINS pUsbIns, PSSMHANDLE pSSM));
    624624/** Pointer to a FNSSMUSBSAVEEXEC() function. */
    625625typedef FNSSMUSBSAVEEXEC *PFNSSMUSBSAVEEXEC;
    … …  
    633633 * @param   pSSM            SSM operation handle.
    634634 */
    635 typedef DECLCALLBACK(int) FNSSMUSBSAVEDONE(PPDMUSBINS pUsbIns, PSSMHANDLE pSSM);
     635typedef DECLCALLBACKTYPE(int, FNSSMUSBSAVEDONE,(PPDMUSBINS pUsbIns, PSSMHANDLE pSSM));
    636636/** Pointer to a FNSSMUSBSAVEDONE() function. */
    637637typedef FNSSMUSBSAVEDONE *PFNSSMUSBSAVEDONE;
    … …  
    645645 * @param   pSSM            SSM operation handle.
    646646 */
    647 typedef DECLCALLBACK(int) FNSSMUSBLOADPREP(PPDMUSBINS pUsbIns, PSSMHANDLE pSSM);
     647typedef DECLCALLBACKTYPE(int, FNSSMUSBLOADPREP,(PPDMUSBINS pUsbIns, PSSMHANDLE pSSM));
    648648/** Pointer to a FNSSMUSBLOADPREP() function. */
    649649typedef FNSSMUSBLOADPREP *PFNSSMUSBLOADPREP;
    … …  
    660660 *                          that doesn't specify a pfnSaveLive callback.
    661661 */
    662 typedef DECLCALLBACK(int) FNSSMUSBLOADEXEC(PPDMUSBINS pUsbIns, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass);
     662typedef DECLCALLBACKTYPE(int, FNSSMUSBLOADEXEC,(PPDMUSBINS pUsbIns, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass));
    663663/** Pointer to a FNSSMUSBLOADEXEC() function. */
    664664typedef FNSSMUSBLOADEXEC *PFNSSMUSBLOADEXEC;
    … …  
    672672 * @param   pSSM            SSM operation handle.
    673673 */
    674 typedef DECLCALLBACK(int) FNSSMUSBLOADDONE(PPDMUSBINS pUsbIns, PSSMHANDLE pSSM);
     674typedef DECLCALLBACKTYPE(int, FNSSMUSBLOADDONE,(PPDMUSBINS pUsbIns, PSSMHANDLE pSSM));
    675675/** Pointer to a FNSSMUSBLOADDONE() function. */
    676676typedef FNSSMUSBLOADDONE *PFNSSMUSBLOADDONE;
    … …  
    692692 * @thread  Any.
    693693 */
    694 typedef DECLCALLBACK(int) FNSSMDRVLIVEPREP(PPDMDRVINS pDrvIns, PSSMHANDLE pSSM);
     694typedef DECLCALLBACKTYPE(int, FNSSMDRVLIVEPREP,(PPDMDRVINS pDrvIns, PSSMHANDLE pSSM));
    695695/** Pointer to a FNSSMDRVLIVEPREP() function. */
    696696typedef FNSSMDRVLIVEPREP *PFNSSMDRVLIVEPREP;
    … …  
    709709 * @thread  Any.
    710710 */
    711 typedef DECLCALLBACK(int) FNSSMDRVLIVEEXEC(PPDMDRVINS pDrvIns, PSSMHANDLE pSSM, uint32_t uPass);
     711typedef DECLCALLBACKTYPE(int, FNSSMDRVLIVEEXEC,(PPDMDRVINS pDrvIns, PSSMHANDLE pSSM, uint32_t uPass));
    712712/** Pointer to a FNSSMDRVLIVEEXEC() function. */
    713713typedef FNSSMDRVLIVEEXEC *PFNSSMDRVLIVEEXEC;
    … …  
    732732 * @thread  Any.
    733733 */
    734 typedef DECLCALLBACK(int) FNSSMDRVLIVEVOTE(PPDMDRVINS pDrvIns, PSSMHANDLE pSSM, uint32_t uPass);
     734typedef DECLCALLBACKTYPE(int, FNSSMDRVLIVEVOTE,(PPDMDRVINS pDrvIns, PSSMHANDLE pSSM, uint32_t uPass));
    735735/** Pointer to a FNSSMDRVLIVEVOTE() function. */
    736736typedef FNSSMDRVLIVEVOTE *PFNSSMDRVLIVEVOTE;
    … …  
    744744 * @param   pSSM            SSM operation handle.
    745745 */
    746 typedef DECLCALLBACK(int) FNSSMDRVSAVEPREP(PPDMDRVINS pDrvIns, PSSMHANDLE pSSM);
     746typedef DECLCALLBACKTYPE(int, FNSSMDRVSAVEPREP,(PPDMDRVINS pDrvIns, PSSMHANDLE pSSM));
    747747/** Pointer to a FNSSMDRVSAVEPREP() function. */
    748748typedef FNSSMDRVSAVEPREP *PFNSSMDRVSAVEPREP;
    … …  
    755755 * @param   pSSM            SSM operation handle.
    756756 */
    757 typedef DECLCALLBACK(int) FNSSMDRVSAVEEXEC(PPDMDRVINS pDrvIns, PSSMHANDLE pSSM);
     757typedef DECLCALLBACKTYPE(int, FNSSMDRVSAVEEXEC,(PPDMDRVINS pDrvIns, PSSMHANDLE pSSM));
    758758/** Pointer to a FNSSMDRVSAVEEXEC() function. */
    759759typedef FNSSMDRVSAVEEXEC *PFNSSMDRVSAVEEXEC;
    … …  
    766766 * @param   pSSM            SSM operation handle.
    767767 */
    768 typedef DECLCALLBACK(int) FNSSMDRVSAVEDONE(PPDMDRVINS pDrvIns, PSSMHANDLE pSSM);
     768typedef DECLCALLBACKTYPE(int, FNSSMDRVSAVEDONE,(PPDMDRVINS pDrvIns, PSSMHANDLE pSSM));
    769769/** Pointer to a FNSSMDRVSAVEDONE() function. */
    770770typedef FNSSMDRVSAVEDONE *PFNSSMDRVSAVEDONE;
    … …  
    777777 * @param   pSSM            SSM operation handle.
    778778 */
    779 typedef DECLCALLBACK(int) FNSSMDRVLOADPREP(PPDMDRVINS pDrvIns, PSSMHANDLE pSSM);
     779typedef DECLCALLBACKTYPE(int, FNSSMDRVLOADPREP,(PPDMDRVINS pDrvIns, PSSMHANDLE pSSM));
    780780/** Pointer to a FNSSMDRVLOADPREP() function. */
    781781typedef FNSSMDRVLOADPREP *PFNSSMDRVLOADPREP;
    … …  
    791791 *                          that doesn't specify a pfnSaveLive callback.
    792792 */
    793 typedef DECLCALLBACK(int) FNSSMDRVLOADEXEC(PPDMDRVINS pDrvIns, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass);
     793typedef DECLCALLBACKTYPE(int, FNSSMDRVLOADEXEC,(PPDMDRVINS pDrvIns, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass));
    794794/** Pointer to a FNSSMDRVLOADEXEC() function. */
    795795typedef FNSSMDRVLOADEXEC *PFNSSMDRVLOADEXEC;
    … …  
    802802 * @param   pSSM            SSM operation handle.
    803803 */
    804 typedef DECLCALLBACK(int) FNSSMDRVLOADDONE(PPDMDRVINS pDrvIns, PSSMHANDLE pSSM);
     804typedef DECLCALLBACKTYPE(int, FNSSMDRVLOADDONE,(PPDMDRVINS pDrvIns, PSSMHANDLE pSSM));
    805805/** Pointer to a FNSSMDRVLOADDONE() function. */
    806806typedef FNSSMDRVLOADDONE *PFNSSMDRVLOADDONE;
    … …  
    822822 * @thread  Any.
    823823 */
    824 typedef DECLCALLBACK(int) FNSSMINTLIVEPREP(PVM pVM, PSSMHANDLE pSSM);
     824typedef DECLCALLBACKTYPE(int, FNSSMINTLIVEPREP,(PVM pVM, PSSMHANDLE pSSM));
    825825/** Pointer to a FNSSMINTLIVEPREP() function. */
    826826typedef FNSSMINTLIVEPREP *PFNSSMINTLIVEPREP;
    … …  
    838838 * @thread  Any.
    839839 */
    840 typedef DECLCALLBACK(int) FNSSMINTLIVEEXEC(PVM pVM, PSSMHANDLE pSSM, uint32_t uPass);
     840typedef DECLCALLBACKTYPE(int, FNSSMINTLIVEEXEC,(PVM pVM, PSSMHANDLE pSSM, uint32_t uPass));
    841841/** Pointer to a FNSSMINTLIVEEXEC() function. */
    842842typedef FNSSMINTLIVEEXEC *PFNSSMINTLIVEEXEC;
    … …  
    860860 * @thread  Any.
    861861 */
    862 typedef DECLCALLBACK(int) FNSSMINTLIVEVOTE(PVM pVM, PSSMHANDLE pSSM, uint32_t uPass);
     862typedef DECLCALLBACKTYPE(int, FNSSMINTLIVEVOTE,(PVM pVM, PSSMHANDLE pSSM, uint32_t uPass));
    863863/** Pointer to a FNSSMINTLIVEVOTE() function. */
    864864typedef FNSSMINTLIVEVOTE *PFNSSMINTLIVEVOTE;
    … …  
    871871 * @param   pSSM            SSM operation handle.
    872872 */
    873 typedef DECLCALLBACK(int) FNSSMINTSAVEPREP(PVM pVM, PSSMHANDLE pSSM);
     873typedef DECLCALLBACKTYPE(int, FNSSMINTSAVEPREP,(PVM pVM, PSSMHANDLE pSSM));
    874874/** Pointer to a FNSSMINTSAVEPREP() function. */
    875875typedef FNSSMINTSAVEPREP *PFNSSMINTSAVEPREP;
    … …  
    882882 * @param   pSSM            SSM operation handle.
    883883 */
    884 typedef DECLCALLBACK(int) FNSSMINTSAVEEXEC(PVM pVM, PSSMHANDLE pSSM);
     884typedef DECLCALLBACKTYPE(int, FNSSMINTSAVEEXEC,(PVM pVM, PSSMHANDLE pSSM));
    885885/** Pointer to a FNSSMINTSAVEEXEC() function. */
    886886typedef FNSSMINTSAVEEXEC *PFNSSMINTSAVEEXEC;
    … …  
    893893 * @param   pSSM            SSM operation handle.
    894894 */
    895 typedef DECLCALLBACK(int) FNSSMINTSAVEDONE(PVM pVM, PSSMHANDLE pSSM);
     895typedef DECLCALLBACKTYPE(int, FNSSMINTSAVEDONE,(PVM pVM, PSSMHANDLE pSSM));
    896896/** Pointer to a FNSSMINTSAVEDONE() function. */
    897897typedef FNSSMINTSAVEDONE *PFNSSMINTSAVEDONE;
    … …  
    904904 * @param   pSSM            SSM operation handle.
    905905 */
    906 typedef DECLCALLBACK(int) FNSSMINTLOADPREP(PVM pVM, PSSMHANDLE pSSM);
     906typedef DECLCALLBACKTYPE(int, FNSSMINTLOADPREP,(PVM pVM, PSSMHANDLE pSSM));
    907907/** Pointer to a FNSSMINTLOADPREP() function. */
    908908typedef FNSSMINTLOADPREP *PFNSSMINTLOADPREP;
    … …  
    918918 *                          that doesn't specify a pfnSaveLive callback.
    919919 */
    920 typedef DECLCALLBACK(int) FNSSMINTLOADEXEC(PVM pVM, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass);
     920typedef DECLCALLBACKTYPE(int, FNSSMINTLOADEXEC,(PVM pVM, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass));
    921921/** Pointer to a FNSSMINTLOADEXEC() function. */
    922922typedef FNSSMINTLOADEXEC *PFNSSMINTLOADEXEC;
    … …  
    929929 * @param   pSSM            SSM operation handle.
    930930 */
    931 typedef DECLCALLBACK(int) FNSSMINTLOADDONE(PVM pVM, PSSMHANDLE pSSM);
     931typedef DECLCALLBACKTYPE(int, FNSSMINTLOADDONE,(PVM pVM, PSSMHANDLE pSSM));
    932932/** Pointer to a FNSSMINTLOADDONE() function. */
    933933typedef FNSSMINTLOADDONE *PFNSSMINTLOADDONE;
    … …  
    948948 * @thread  Any.
    949949 */
    950 typedef DECLCALLBACK(int) FNSSMEXTLIVEPREP(PSSMHANDLE pSSM, void *pvUser);
     950typedef DECLCALLBACKTYPE(int, FNSSMEXTLIVEPREP,(PSSMHANDLE pSSM, void *pvUser));
    951951/** Pointer to a FNSSMEXTLIVEPREP() function. */
    952952typedef FNSSMEXTLIVEPREP *PFNSSMEXTLIVEPREP;
    … …  
    964964 * @thread  Any.
    965965 */
    966 typedef DECLCALLBACK(int) FNSSMEXTLIVEEXEC(PSSMHANDLE pSSM, void *pvUser, uint32_t uPass);
     966typedef DECLCALLBACKTYPE(int, FNSSMEXTLIVEEXEC,(PSSMHANDLE pSSM, void *pvUser, uint32_t uPass));
    967967/** Pointer to a FNSSMEXTLIVEEXEC() function. */
    968968typedef FNSSMEXTLIVEEXEC *PFNSSMEXTLIVEEXEC;
    … …  
    986986 * @thread  Any.
    987987 */
    988 typedef DECLCALLBACK(int) FNSSMEXTLIVEVOTE(PSSMHANDLE pSSM, void *pvUser, uint32_t uPass);
     988typedef DECLCALLBACKTYPE(int, FNSSMEXTLIVEVOTE,(PSSMHANDLE pSSM, void *pvUser, uint32_t uPass));
    989989/** Pointer to a FNSSMEXTLIVEVOTE() function. */
    990990typedef FNSSMEXTLIVEVOTE *PFNSSMEXTLIVEVOTE;
    … …  
    997997 * @param   pvUser          User argument.
    998998 */
    999 typedef DECLCALLBACK(int) FNSSMEXTSAVEPREP(PSSMHANDLE pSSM, void *pvUser);
     999typedef DECLCALLBACKTYPE(int, FNSSMEXTSAVEPREP,(PSSMHANDLE pSSM, void *pvUser));
    10001000/** Pointer to a FNSSMEXTSAVEPREP() function. */
    10011001typedef FNSSMEXTSAVEPREP *PFNSSMEXTSAVEPREP;
    … …  
    10081008 * @author  The lack of return code is for legacy reasons.
    10091009 */
    1010 typedef DECLCALLBACK(void) FNSSMEXTSAVEEXEC(PSSMHANDLE pSSM, void *pvUser);
     1010typedef DECLCALLBACKTYPE(void, FNSSMEXTSAVEEXEC,(PSSMHANDLE pSSM, void *pvUser));
    10111011/** Pointer to a FNSSMEXTSAVEEXEC() function. */
    10121012typedef FNSSMEXTSAVEEXEC *PFNSSMEXTSAVEEXEC;
    … …  
    10191019 * @param   pvUser          User argument.
    10201020 */
    1021 typedef DECLCALLBACK(int) FNSSMEXTSAVEDONE(PSSMHANDLE pSSM, void *pvUser);
     1021typedef DECLCALLBACKTYPE(int, FNSSMEXTSAVEDONE,(PSSMHANDLE pSSM, void *pvUser));
    10221022/** Pointer to a FNSSMEXTSAVEDONE() function. */
    10231023typedef FNSSMEXTSAVEDONE *PFNSSMEXTSAVEDONE;
    … …  
    10301030 * @param   pvUser          User argument.
    10311031 */
    1032 typedef DECLCALLBACK(int) FNSSMEXTLOADPREP(PSSMHANDLE pSSM, void *pvUser);
     1032typedef DECLCALLBACKTYPE(int, FNSSMEXTLOADPREP,(PSSMHANDLE pSSM, void *pvUser));
    10331033/** Pointer to a FNSSMEXTLOADPREP() function. */
    10341034typedef FNSSMEXTLOADPREP *PFNSSMEXTLOADPREP;
    … …  
    10451045 * @remark  The odd return value is for legacy reasons.
    10461046 */
    1047 typedef DECLCALLBACK(int) FNSSMEXTLOADEXEC(PSSMHANDLE pSSM, void *pvUser, uint32_t uVersion, uint32_t uPass);
     1047typedef DECLCALLBACKTYPE(int, FNSSMEXTLOADEXEC,(PSSMHANDLE pSSM, void *pvUser, uint32_t uVersion, uint32_t uPass));
    10481048/** Pointer to a FNSSMEXTLOADEXEC() function. */
    10491049typedef FNSSMEXTLOADEXEC *PFNSSMEXTLOADEXEC;
    … …  
    10561056 * @param   pvUser          User argument.
    10571057 */
    1058 typedef DECLCALLBACK(int) FNSSMEXTLOADDONE(PSSMHANDLE pSSM, void *pvUser);
     1058typedef DECLCALLBACKTYPE(int, FNSSMEXTLOADDONE,(PSSMHANDLE pSSM, void *pvUser));
    10591059/** Pointer to a FNSSMEXTLOADDONE() function. */
    10601060typedef FNSSMEXTLOADDONE *PFNSSMEXTLOADDONE;
    … …  
    10841084     * @param   cbToWrite           The number of bytes to write.
    10851085     */
    1086     DECLCALLBACKMEMBER(int, pfnWrite)(void *pvUser, uint64_t offStream, const void *pvBuf, size_t cbToWrite);
     1086    DECLCALLBACKMEMBER(int, pfnWrite,(void *pvUser, uint64_t offStream, const void *pvBuf, size_t cbToWrite));
    10871087
    10881088    /**
    … …  
    10981098     *                              end of the stream is encountered.
    10991099     */
    1100     DECLCALLBACKMEMBER(int, pfnRead)(void *pvUser, uint64_t offStream, void *pvBuf, size_t cbToRead, size_t *pcbRead);
     1100    DECLCALLBACKMEMBER(int, pfnRead,(void *pvUser, uint64_t offStream, void *pvBuf, size_t cbToRead, size_t *pcbRead));
    11011101
    11021102    /**
    … …  
    11121112     * @param   poffActual          Where to store the new file position. Optional.
    11131113     */
    1114     DECLCALLBACKMEMBER(int, pfnSeek)(void *pvUser, int64_t offSeek, unsigned uMethod, uint64_t *poffActual);
     1114    DECLCALLBACKMEMBER(int, pfnSeek,(void *pvUser, int64_t offSeek, unsigned uMethod, uint64_t *poffActual));
    11151115
    11161116    /**
    … …  
    11201120     * @param   pvUser              The user argument.
    11211121     */
    1122     DECLCALLBACKMEMBER(uint64_t, pfnTell)(void *pvUser);
     1122    DECLCALLBACKMEMBER(uint64_t, pfnTell,(void *pvUser));
    11231123
    11241124    /**
    … …  
    11311131     * @param   pcb                 Where to return the size/length.
    11321132     */
    1133     DECLCALLBACKMEMBER(int, pfnSize)(void *pvUser, uint64_t *pcb);
     1133    DECLCALLBACKMEMBER(int, pfnSize,(void *pvUser, uint64_t *pcb));
    11341134
    11351135    /**
    … …  
    11411141     * @remarks The method is expected to do a LogRel on failure.
    11421142     */
    1143     DECLCALLBACKMEMBER(int, pfnIsOk)(void *pvUser);
     1143    DECLCALLBACKMEMBER(int, pfnIsOk,(void *pvUser));
    11441144
    11451145    /**
    … …  
    11501150     * @param   fCancelled          True if the operation was cancelled.
    11511151     */
    1152     DECLCALLBACKMEMBER(int, pfnClose)(void *pvUser, bool fCancelled);
     1152    DECLCALLBACKMEMBER(int, pfnClose,(void *pvUser, bool fCancelled));
    11531153
    11541154    /** Struct magic + version (SSMSTRMOPS_VERSION). */

  • trunk/include/VBox/vmm/stam.h

    r84119 r85121  
    11911191 * @param   pvSample    The sample registered using STAMR3RegisterCallback.
    11921192 */
    1193 typedef void FNSTAMR3CALLBACKRESET(PVM pVM, void *pvSample);
     1193typedef DECLCALLBACKTYPE(void, FNSTAMR3CALLBACKRESET,(PVM pVM, void *pvSample));
    11941194/** Pointer to a STAM sample reset callback. */
    11951195typedef FNSTAMR3CALLBACKRESET *PFNSTAMR3CALLBACKRESET;
    … …  
    12031203 * @param   cchBuf      The size of the buffer.
    12041204 */
    1205 typedef void FNSTAMR3CALLBACKPRINT(PVM pVM, void *pvSample, char *pszBuf, size_t cchBuf);
     1205typedef DECLCALLBACKTYPE(void, FNSTAMR3CALLBACKPRINT,(PVM pVM, void *pvSample, char *pszBuf, size_t cchBuf));
    12061206/** Pointer to a STAM sample print callback. */
    12071207typedef FNSTAMR3CALLBACKPRINT *PFNSTAMR3CALLBACKPRINT;
    … …  
    12471247 * @param   pvUser          The pvUser argument given to STAMR3Enum().
    12481248 */
    1249 typedef DECLCALLBACK(int) FNSTAMR3ENUM(const char *pszName, STAMTYPE enmType, void *pvSample, STAMUNIT enmUnit,
    1250                                        STAMVISIBILITY enmVisiblity, const char *pszDesc, void *pvUser);
     1249typedef DECLCALLBACKTYPE(int, FNSTAMR3ENUM,(const char *pszName, STAMTYPE enmType, void *pvSample, STAMUNIT enmUnit,
     1250                                            STAMVISIBILITY enmVisiblity, const char *pszDesc, void *pvUser));
    12511251/** Pointer to a FNSTAMR3ENUM(). */
    12521252typedef FNSTAMR3ENUM *PFNSTAMR3ENUM;

  • trunk/include/VBox/vmm/tm.h

    r82968 r85121  
    165165 * @param   pvUser          User argument specified upon timer creation.
    166166 */
    167 typedef DECLCALLBACK(void) FNTMTIMERDEV(PPDMDEVINS pDevIns, PTMTIMER pTimer, void *pvUser);
     167typedef DECLCALLBACKTYPE(void, FNTMTIMERDEV,(PPDMDEVINS pDevIns, PTMTIMER pTimer, void *pvUser));
    168168/** Pointer to a device timer callback function. */
    169169typedef FNTMTIMERDEV *PFNTMTIMERDEV;
    … …  
    177177 * @param   pvUser          User argument specified upon timer creation.
    178178 */
    179 typedef DECLCALLBACK(void) FNTMTIMERUSB(PPDMUSBINS pUsbIns, PTMTIMER pTimer, void *pvUser);
     179typedef DECLCALLBACKTYPE(void, FNTMTIMERUSB,(PPDMUSBINS pUsbIns, PTMTIMER pTimer, void *pvUser));
    180180/** Pointer to a timer callback for a USB device. */
    181181typedef FNTMTIMERUSB *PFNTMTIMERUSB;
    … …  
    188188 * @param   pvUser          User argument specified upon timer creation.
    189189 */
    190 typedef DECLCALLBACK(void) FNTMTIMERDRV(PPDMDRVINS pDrvIns, PTMTIMER pTimer, void *pvUser);
     190typedef DECLCALLBACKTYPE(void, FNTMTIMERDRV,(PPDMDRVINS pDrvIns, PTMTIMER pTimer, void *pvUser));
    191191/** Pointer to a driver timer callback function. */
    192192typedef FNTMTIMERDRV *PFNTMTIMERDRV;
    … …  
    198198 * @param   pTimer          The timer handle.
    199199 */
    200 typedef DECLCALLBACK(void) FNTMTIMERSRV(PPDMSRVINS pSrvIns, PTMTIMER pTimer);
     200typedef DECLCALLBACKTYPE(void, FNTMTIMERSRV,(PPDMSRVINS pSrvIns, PTMTIMER pTimer));
    201201/** Pointer to a service timer callback function. */
    202202typedef FNTMTIMERSRV *PFNTMTIMERSRV;
    … …  
    209209 * @param   pvUser          User argument specified upon timer creation.
    210210 */
    211 typedef DECLCALLBACK(void) FNTMTIMERINT(PVM pVM, PTMTIMER pTimer, void *pvUser);
     211typedef DECLCALLBACKTYPE(void, FNTMTIMERINT,(PVM pVM, PTMTIMER pTimer, void *pvUser));
    212212/** Pointer to internal timer callback function. */
    213213typedef FNTMTIMERINT *PFNTMTIMERINT;
    … …  
    218218 * @param   pvUser          User argument as specified when the timer was created.
    219219 */
    220 typedef DECLCALLBACK(void) FNTMTIMEREXT(void *pvUser);
     220typedef DECLCALLBACKTYPE(void, FNTMTIMEREXT,(void *pvUser));
    221221/** Pointer to an external timer callback function. */
    222222typedef FNTMTIMEREXT *PFNTMTIMEREXT;

  • trunk/include/VBox/vmm/vmapi.h

    r82968 r85121  
    6868 * @param   args            Error message arguments.
    6969 */
    70 typedef DECLCALLBACK(void) FNVMATERROR(PUVM pUVM, void *pvUser, int rc, RT_SRC_POS_DECL, const char *pszError, va_list args);
     70typedef DECLCALLBACKTYPE(void, FNVMATERROR,(PUVM pUVM, void *pvUser, int rc, RT_SRC_POS_DECL, const char *pszError, va_list args));
    7171/** Pointer to a VM error callback. */
    7272typedef FNVMATERROR *PFNVMATERROR;
    … …  
    118118 * @param   va              Error message arguments.
    119119 */
    120 typedef DECLCALLBACK(void) FNVMATRUNTIMEERROR(PUVM pUVM, void *pvUser, uint32_t fFlags, const char *pszErrorId,
    121                                               const char *pszFormat, va_list va) RT_IPRT_FORMAT_ATTR(5, 0);
     120typedef DECLCALLBACKTYPE(void, FNVMATRUNTIMEERROR,(PUVM pUVM, void *pvUser, uint32_t fFlags, const char *pszErrorId,
     121                                                   const char *pszFormat, va_list va)) RT_IPRT_FORMAT_ATTR(5, 0);
    122122/** Pointer to a VM runtime error callback. */
    123123typedef FNVMATRUNTIMEERROR *PFNVMATRUNTIMEERROR;
    … …  
    158158 * @param   pvUser      The user argument.
    159159 */
    160 typedef DECLCALLBACK(void) FNVMATSTATE(PUVM pUVM, VMSTATE enmState, VMSTATE enmOldState, void *pvUser);
     160typedef DECLCALLBACKTYPE(void, FNVMATSTATE,(PUVM pUVM, VMSTATE enmState, VMSTATE enmOldState, void *pvUser));
    161161/** Pointer to a VM state callback. */
    162162typedef FNVMATSTATE *PFNVMATSTATE;
    … …  
    363363 * @param   pvUser      User specified argument.
    364364 */
    365 typedef DECLCALLBACK(int) FNVMPROGRESS(PUVM pUVM, unsigned uPercent, void *pvUser);
     365typedef DECLCALLBACKTYPE(int, FNVMPROGRESS,(PUVM pUVM, unsigned uPercent, void *pvUser));
    366366/** Pointer to a FNVMPROGRESS function. */
    367367typedef FNVMPROGRESS *PFNVMPROGRESS;

  • trunk/include/VBox/vmm/vmm.h

    r84458 r85121  
    9898 * @param   pvUser          The user argument.
    9999 */
    100 typedef DECLCALLBACK(int) FNVMMR0CALLRING3NOTIFICATION(PVMCPUCC pVCpu, VMMCALLRING3 enmOperation, void *pvUser);
     100typedef DECLCALLBACKTYPE(int, FNVMMR0CALLRING3NOTIFICATION,(PVMCPUCC pVCpu, VMMCALLRING3 enmOperation, void *pvUser));
    101101/** Pointer to a FNRTMPNOTIFICATION(). */
    102102typedef FNVMMR0CALLRING3NOTIFICATION *PFNVMMR0CALLRING3NOTIFICATION;
    … …  
    113113 * @param   pvUser  The user argument.
    114114 */
    115 typedef DECLCALLBACK(VBOXSTRICTRC) FNVMMEMTRENDEZVOUS(PVM pVM, PVMCPU pVCpu, void *pvUser);
     115typedef DECLCALLBACKTYPE(VBOXSTRICTRC, FNVMMEMTRENDEZVOUS,(PVM pVM, PVMCPU pVCpu, void *pvUser));
    116116/** Pointer to a rendezvous callback function. */
    117117typedef FNVMMEMTRENDEZVOUS *PFNVMMEMTRENDEZVOUS;
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