VirtualBox

Changeset 13378

Show
Ignore:
Timestamp:
10/17/08 16:24:44 (3 months ago)
Author:
vboxsync
Message:

HGCM: reverted r33362 and r37670 (added a callback parameter type)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/include/VBox/hgcmsvc.h

    r13157 r13378  
    5858 * 3.2->3.3 Because pfnDisconnectClient helper was added 
    5959 * 3.3->4.1 Because the pvService entry and parameter was added 
    60  * 4.1->4.2 Because the VBOX_HGCM_SVC_PARM_CALLBACK paramteter type was added 
    6160 */ 
    6261#define VBOX_HGCM_SVC_VERSION_MAJOR (0x0004) 
    63 #define VBOX_HGCM_SVC_VERSION_MINOR (0x0002) 
     62#define VBOX_HGCM_SVC_VERSION_MINOR (0x0001) 
    6463#define VBOX_HGCM_SVC_VERSION ((VBOX_HGCM_SVC_VERSION_MAJOR << 16) + VBOX_HGCM_SVC_VERSION_MINOR) 
    6564 
    …… 
    8382typedef VBOXHGCMSVCHELPERS *PVBOXHGCMSVCHELPERS; 
    8483 
    85 /** 
    86  * Callback type for HGCM services which can send notification messages. 
    87  * Intended for use on the host side. 
    88  */ 
    89 typedef struct _VBOXHGCMCALLBACKHDR *PVBOXHGCMCALLBACKHDR; 
    90 typedef DECLCALLBACK(void) FNVBOXHGCMCALLBACK(PVBOXHGCMCALLBACKHDR pvParm); 
    91 typedef FNVBOXHGCMCALLBACK *PFNVBOXHGCMCALLBACK; 
    9284 
    93 /** 
    94  * Callback parameter structure header for FNVBOXHGCMCALLBACK callback 
    95  * functions.  The structure passed as a callback parameter should start 
    96  * with this header. 
    97  */ 
    98 typedef struct _VBOXHGCMCALLBACKHDR 
    99 { 
    100     /** Magic number for runtime sanity check */ 
    101     uint32_t  u32Magic; 
    102     /** Size of the embedding structure */ 
    103     uint32_t  cbStruct; 
    104     /** Callback user data */ 
    105     void     *pvData; 
    106 } VBOXHGCMCALLBACKHDR; 
    107  
    108 enum 
    109 { 
    110     /** Magic number for sanity checking the VBOXHGCMCALLBACKHDR structure */ 
    111     VBOXHGCMCALLBACKMAGIC = 0x69c87a78 
    112 }; 
    113  
    114 #define VBOX_HGCM_SVC_PARM_INVALID  (0U) 
    115 #define VBOX_HGCM_SVC_PARM_32BIT    (1U) 
    116 #define VBOX_HGCM_SVC_PARM_64BIT    (2U) 
    117 #define VBOX_HGCM_SVC_PARM_PTR      (3U) 
    118 #define VBOX_HGCM_SVC_PARM_CALLBACK (4U) 
     85#define VBOX_HGCM_SVC_PARM_INVALID (0U) 
     86#define VBOX_HGCM_SVC_PARM_32BIT (1U) 
     87#define VBOX_HGCM_SVC_PARM_64BIT (2U) 
     88#define VBOX_HGCM_SVC_PARM_PTR   (3U) 
    11989 
    12090typedef struct VBOXHGCMSVCPARM 
    …… 
    132102            void *addr; 
    133103        } pointer; 
    134         struct 
    135         { 
    136             PFNVBOXHGCMCALLBACK pFunction; 
    137             void *pvData; 
    138         } callback; 
    139104    } u; 
    140105} VBOXHGCMSVCPARM; 
    …… 
    208173    DECLR3CALLBACKMEMBER(int, pfnLoadState, (void *pvService, uint32_t u32ClientID, void *pvClient, PSSMHANDLE pSSM)); 
    209174 
    210     /** Manage the service extension. */ 
     175    /** Register a service extension callback. */ 
    211176    DECLR3CALLBACKMEMBER(int, pfnRegisterExtension, (void *pvService, PFNHGCMSVCEXT pfnExtension, void *pvExtension)); 
    212177 

© 2008 Sun Microsystems, Inc.
Contact – Privacy policy