Changeset 58340 in vbox for trunk/src/VBox
- Timestamp:
- Oct 20, 2015 1:58:41 PM (9 years ago)
- svn:sync-xref-src-repo-rev:
- 103540
- Location:
- trunk/src/VBox/HostDrivers
- Files:
-
- 29 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/HostDrivers/Support/SUPDrv-dtrace.cpp
r57358 r58340 1046 1046 /** 1047 1047 * Module initialization code. 1048 *1049 * @param hMod Opque module handle.1050 1048 */ 1051 1049 const SUPDRVTRACERREG * VBOXCALL supdrvDTraceInit(void) -
trunk/src/VBox/HostDrivers/Support/SUPDrv.cpp
r57735 r58340 2398 2398 * @param pSession Session data. 2399 2399 * @param pReqHdr The request header. 2400 * @param cbReq The size of the request buffer. 2400 2401 */ 2401 2402 int VBOXCALL supdrvIOCtl(uintptr_t uIOCtl, PSUPDRVDEVEXT pDevExt, PSUPDRVSESSION pSession, PSUPREQHDR pReqHdr, size_t cbReq) … … 2620 2621 * All future reference must use this identifier. 2621 2622 * @returns NULL on failure. 2623 * @param pSession The caller's session. 2624 * @param enmType The object type. 2622 2625 * @param pfnDestructor The destructore function which will be called when the reference count reaches 0. 2623 2626 * @param pvUser1 The first user argument. … … 3381 3384 * @param ppvR3 Where to store the address of the Ring-3 mapping. 3382 3385 * NULL if no ring-3 mapping. 3383 * @param ppvR 3Where to store the address of the Ring-0 mapping.3386 * @param ppvR0 Where to store the address of the Ring-0 mapping. 3384 3387 * NULL if no ring-0 mapping. 3385 3388 * @param paPages Where to store the addresses of the pages. Optional. … … 3646 3649 * Reports a bad context, currenctly that means EFLAGS.AC is 0 instead of 1. 3647 3650 * 3648 * @param p Session The session of the caller.3651 * @param pDevExt The device extension. 3649 3652 * @param pszFile The source file where the caller detected the bad 3650 3653 * context. … … 3869 3872 * 3870 3873 * @returns VBox status code. 3871 * @param fIsSmxModeAmbiguous Where to writewhether the SMX mode causes3874 * @param pfIsSmxModeAmbiguous Where to return whether the SMX mode causes 3872 3875 * ambiguity that makes us unsure whether we 3873 3876 * really can use VT-x or not. … … 3876 3879 * The caller is also expected to check that the CPU is an Intel (or 3877 3880 * VIA) CPU -and- that it supports VT-x. Otherwise, this function 3878 * might throw a #GP fault as it tries to read/write MSRs that may not3881 * might throw a \#GP fault as it tries to read/write MSRs that may not 3879 3882 * be present! 3880 3883 */ … … 5232 5235 * @returns IPRT status code. 5233 5236 * @param pDevExt Device globals. 5234 * @param pSession Session data. 5235 * @param pVMMR0 VMMR0 image handle. 5237 * @param pvVMMR0 VMMR0 image handle. 5236 5238 * @param pvVMMR0EntryFast VMMR0EntryFast address. 5237 5239 * @param pvVMMR0EntryEx VMMR0EntryEx address. -
trunk/src/VBox/HostDrivers/Support/SUPDrvGip.cpp
r57358 r58340 4242 4242 * other error code on internal error. 4243 4243 * 4244 * @param p This Pointer to the grant service instance data.4244 * @param pDevExt The device instance data. 4245 4245 * @param enmCurState The current state. 4246 4246 * @param enmNewState The new state we're waiting for it to enter. -
trunk/src/VBox/HostDrivers/Support/SUPDrvIOC.h
r57378 r58340 1442 1442 } Modify; 1443 1443 1444 /** Reserve space for the future. .*/1444 /** Reserve space for the future. */ 1445 1445 uint64_t auPadding[3]; 1446 1446 } uArgs; -
trunk/src/VBox/HostDrivers/Support/SUPDrvInternal.h
r57378 r58340 231 231 #endif 232 232 233 #ifdef DOXYGEN_RUNNING 234 # define SUPDRV_WITH_MSR_PROBER 235 # define SUPDRV_WITHOUT_MSR_PROBER 236 #endif 237 233 238 #if 1 234 /** Use a dedicated kernel thread to service TSC-delta measurement requests. 235 * @todo Test on servers with many CPUs and sockets. */ 236 #define SUPDRV_USE_TSC_DELTA_THREAD 237 #endif 239 /** @def SUPDRV_USE_TSC_DELTA_THREAD 240 * Use a dedicated kernel thread to service TSC-delta measurement requests. 241 * @todo Test on servers with many CPUs and sockets. */ 242 # define SUPDRV_USE_TSC_DELTA_THREAD 243 #endif 244 238 245 239 246 /******************************************************************************* -
trunk/src/VBox/HostDrivers/Support/SUPDrvTracer.cpp
r57358 r58340 249 249 * @param uVtgHdrAddr The address where the header is actually 250 250 * loaded. 251 * @param cbVtgObj The alleged size of the header.252 251 * @param pbImage The image base, if available. 253 252 * @param cbImage The image size, if available. … … 868 867 * 869 868 * @returns VBox status code. 870 * @param p szName The driver name.869 * @param pDevExt The device instance data. 871 870 * @param pVtgHdr The VTG object header. 872 871 * @param pImage The image if applicable. … … 1103 1102 * 1104 1103 * @param pSession The support driver session handle. 1105 * @param pVtgHdr The VTG header.1106 1104 */ 1107 1105 SUPR0DECL(void) SUPR0TracerDeregisterDrv(PSUPDRVSESSION pSession) -
trunk/src/VBox/HostDrivers/Support/SUPLib.cpp
r57358 r58340 1791 1791 * 1792 1792 * @param pThis The string table structure. 1793 * @param paProbLocs The probe location array. 1794 * @param cProbLocs The number of probe locations. 1793 * @param paProbeLocs32 The probe location array, 32-bit type variant. 1794 * @param paProbeLocs64 The probe location array, 64-bit type variant. 1795 * @param cProbeLocs The number of elements in the array. 1796 * @param f32Bit Set if @a paProbeLocs32 should be used, when 1797 * clear use @a paProbeLocs64. 1795 1798 */ 1796 1799 static void supr3TracerDestroyStrTab(PSUPDRVTRACERSTRTAB pThis, PVTGPROBELOC32 paProbeLocs32, PVTGPROBELOC64 paProbeLocs64, … … 1819 1822 * 1820 1823 * @returns Pointer to a string table structure. NULL on failure. 1821 * @param paProbLocs The probe location array. 1822 * @param cProbLocs The number of elements in the array. 1823 * @param cBits 1824 * @param paProbeLocs32 The probe location array, 32-bit type variant. 1825 * @param paProbeLocs64 The probe location array, 64-bit type variant. 1826 * @param cProbeLocs The number of elements in the array. 1827 * @param offDelta Relocation offset for the string pointers. 1828 * @param f32Bit Set if @a paProbeLocs32 should be used, when 1829 * clear use @a paProbeLocs64. 1824 1830 */ 1825 1831 static PSUPDRVTRACERSTRTAB supr3TracerCreateStrTab(PVTGPROBELOC32 paProbeLocs32, -
trunk/src/VBox/HostDrivers/Support/SUPLibLdr.cpp
r57378 r58340 350 350 * 351 351 * @returns VBox status code. 352 * @param pszFilename Name of the VMMR0 image file 352 * @param pszFilename Name of the VMMR0 image file 353 * @param pszModule The modulen name. 354 * @param pszSrvReqHandler The service request handler symbol name, 355 * optional. 356 * @param pErrInfo Where to store detailed error info. Optional. 357 * @param ppvImageBase Where to return the load address. 353 358 */ 354 359 static int supLoadModule(const char *pszFilename, const char *pszModule, const char *pszSrvReqHandler, -
trunk/src/VBox/HostDrivers/Support/SUPR0IdcClientStubs.c
r57358 r58340 40 40 * 41 41 * @param pHandle The IDC handle. 42 * @param ppfn Where to return the address of the symbol. 42 43 * @param pszName The name of the symbol. 43 44 */ … … 66 67 * @returns Pointer to the symbol on success, NULL on failure. 67 68 * 68 * @param pHandle The IDC handle. 69 * @param pSession The IDC session. 70 * @param ppfn Where to return the address of the symbol. 69 71 * @param pszName The name of the symbol. 70 72 */ -
trunk/src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp
r58132 r58340 845 845 846 846 /** 847 * Returns the full path to the executable .847 * Returns the full path to the executable in g_szSupLibHardenedExePath. 848 848 * 849 849 * @returns IPRT status code. 850 * @param pszPath Where to store it.851 * @param cchPath How big that buffer is.852 850 */ 853 851 static void supR3HardenedGetFullExePath(void) -
trunk/src/VBox/HostDrivers/Support/SUPSvc.cpp
r57358 r58340 305 305 * 306 306 * @param pszFormat The log string. No trailing newline. 307 * @param ...Format arguments.307 * @param va Format arguments. 308 308 * 309 309 * @todo This should later be replaced by the release logger and callback destination(s). -
trunk/src/VBox/HostDrivers/Support/SUPSvcInternal.h
r56293 r58340 54 54 * Logs the message to the appropriate system log. 55 55 * 56 * @param ps MsgThe log string.56 * @param pszMsg The log string. 57 57 */ 58 58 void supSvcOsLogErrorStr(const char *pszMsg); -
trunk/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp
r58277 r58340 849 849 * 850 850 * @returns VBox status code, see supdrvIDC. 851 * @param iReq The request code.851 * @param uReq The request code. 852 852 * @param pReq The request. 853 853 */ -
trunk/src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c
r57358 r58340 75 75 static d_open_t VBoxDrvFreeBSDOpenUsr; 76 76 static d_open_t VBoxDrvFreeBSDOpenSys; 77 static void VBoxDrvFreeBSDDtr(void *p Data);77 static void VBoxDrvFreeBSDDtr(void *pvData); 78 78 static d_ioctl_t VBoxDrvFreeBSDIOCtl; 79 79 static int VBoxDrvFreeBSDIOCtlSlow(PSUPDRVSESSION pSession, u_long ulCmd, caddr_t pvData, struct thread *pTd); … … 225 225 * @returns 0 on success, errno on failure. 226 226 * EBUSY if the device is used by someone else. 227 * @param pDev The device node. 228 * @param fOpen The open flags. 229 * @param pTd The thread. 230 * @param iDevType ??? 231 */ 232 static int vboxdrvFreeBSDOpenCommon(struct cdev *pDev, int fOpen, int iDevtype, struct thread *pTd, bool fUnrestricted) 227 * @param pDev The device node. 228 * @param fOpen The open flags. 229 * @param iDevType Some device type thing we don't use. 230 * @param pTd The thread. 231 * @param fUnrestricted Set if opening /dev/vboxdrv, clear if /dev/vboxdrvu. 232 */ 233 static int vboxdrvFreeBSDOpenCommon(struct cdev *pDev, int fOpen, int iDevType, struct thread *pTd, bool fUnrestricted) 233 234 { 234 235 PSUPDRVSESSION pSession; … … 253 254 pSession->Uid = stuff; 254 255 pSession->Gid = stuff; */ 255 devfs_set_cdevpriv(pSession, VBoxDrvFreeBSDDtr);256 rc = devfs_set_cdevpriv(pSession, vboxdrvFreeBSDDtr); Assert(rc == 0); 256 257 Log(("VBoxDrvFreeBSDOpen: pSession=%p\n", pSession)); 257 258 ASMAtomicIncU32(&g_cUsers); … … 264 265 265 266 /** For vboxdrv. */ 266 static int VBoxDrvFreeBSDOpenSys(struct cdev *pDev, int fOpen, int iDev type, struct thread *pTd)267 { 268 return vboxdrvFreeBSDOpenCommon(pDev, fOpen, iDev type, pTd, true);267 static int VBoxDrvFreeBSDOpenSys(struct cdev *pDev, int fOpen, int iDevType, struct thread *pTd) 268 { 269 return vboxdrvFreeBSDOpenCommon(pDev, fOpen, iDevType, pTd, true); 269 270 } 270 271 271 272 272 273 /** For vboxdrvu. */ 273 static int VBoxDrvFreeBSDOpenUsr(struct cdev *pDev, int fOpen, int iDev type, struct thread *pTd)274 { 275 return vboxdrvFreeBSDOpenCommon(pDev, fOpen, iDev type, pTd, false);276 } 277 278 279 /** 280 * Close a file device previously opened by VBoxDrvFreeBSDOpen 274 static int VBoxDrvFreeBSDOpenUsr(struct cdev *pDev, int fOpen, int iDevType, struct thread *pTd) 275 { 276 return vboxdrvFreeBSDOpenCommon(pDev, fOpen, iDevType, pTd, false); 277 } 278 279 280 /** 281 * Close a file device previously opened by VBoxDrvFreeBSDOpen. 281 282 * 282 283 * @returns 0 on success. 283 * @param pDev The device. 284 * @param fFile The file descriptor flags. 285 * @param DevType The device type (CHR. 286 * @param pTd The calling thread. 287 */ 288 static void VBoxDrvFreeBSDDtr(void *pData) 289 { 290 PSUPDRVSESSION pSession = pData; 291 Log(("VBoxDrvFreeBSDDtr: pSession=%p\n", pSession)); 284 * @param pvData The session being closed. 285 */ 286 static void vboxdrvFreeBSDDtr(void *pvData) 287 { 288 PSUPDRVSESSION pSession = pvData; 289 Log(("vboxdrvFreeBSDDtr: pSession=%p\n", pSession)); 292 290 293 291 /* … … 469 467 * 470 468 * @returns VBox status code, see supdrvIDC. 471 * @param iReq The request code.469 * @param uReq The request code. 472 470 * @param pReq The request. 473 471 */ -
trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
r57840 r58340 604 604 * Suspend callback. 605 605 * @param pDev Pointer to the platform device. 606 * @param State message type, see Documentation/power/devices.txt. 607 */ 608 # if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30) 606 * @param State Message type, see Documentation/power/devices.txt. 607 * Ignored. 608 */ 609 # if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30) && !defined(DOXYGEN_RUNNING) 609 610 static int VBoxDrvSuspend(struct device *pDev) 610 611 # else … … 640 641 * @param ulArg The argument specified to ioctl(). 641 642 */ 642 #if def HAVE_UNLOCKED_IOCTL643 #if defined(HAVE_UNLOCKED_IOCTL) || defined(DOXYGEN_RUNNING) 643 644 static long VBoxDrvLinuxIOCtl(struct file *pFilp, unsigned int uCmd, unsigned long ulArg) 644 645 #else … … 811 812 * 812 813 * @returns VBox status code, see supdrvIDC. 813 * @param iReq The request code.814 * @param uReq The request code. 814 815 * @param pReq The request. 815 816 */ -
trunk/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c
r57358 r58340 665 665 * @param Dev Device number 666 666 * @param Cmd Operation identifier 667 * @param pArg 667 * @param pArgs Arguments from user to driver 668 668 * @param Mode Information bitfield (read/write, address space etc.) 669 669 * @param pCred User credentials … … 745 745 * 746 746 * @param pSession The session. 747 * @param CmdThe IOCtl command.747 * @param iCmd The IOCtl command. 748 748 * @param Mode Information bitfield (for specifying ownership of data) 749 749 * @param iArg User space address of the request buffer. … … 849 849 * 850 850 * @returns VBox status code, see supdrvIDC. 851 * @param iReq The request code.851 * @param uReq The request code. 852 852 * @param pReq The request. 853 853 */ -
trunk/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp
r57501 r58340 1005 1005 * @param pvOutput The output buffer as specfied by the user. 1006 1006 * @param cbOutput The size of the output buffer. 1007 * @param u Function The function.1007 * @param uCmd The I/O command/function being invoked. 1008 1008 * @param pIoStatus Where to return the status of the operation. 1009 1009 * @param pDevObj The device object.. … … 1259 1259 * @returns NT status code. 1260 1260 * 1261 * @param pDev Obj Device object.1261 * @param pDevExt Device extension. 1262 1262 * @param pSession The session. 1263 1263 * @param pIrp Request packet. -
trunk/src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdp.c
r57358 r58340 1202 1202 * 1203 1203 * @returns Pointer to the instance by the given name. NULL if not found. 1204 * @param pGlobals The globals.1205 1204 * @param pszName The name of the instance. 1206 1205 */ -
trunk/src/VBox/HostDrivers/VBoxNetAdp/darwin/VBoxNetAdp-darwin.cpp
r58093 r58340 337 337 * Device open. Called on open /dev/vboxnetctl 338 338 * 339 * @param pInode Pointer to inode info structure. 340 * @param pFilp Associated file pointer. 339 * @param Dev The device number. 340 * @param fFlags ???. 341 * @param fDevType ???. 342 * @param pProcess The process issuing this request. 341 343 */ 342 344 static int VBoxNetAdpDarwinOpen(dev_t Dev, int fFlags, int fDevType, struct proc *pProcess) -
trunk/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFltInternal.h
r56293 r58340 382 382 * 383 383 * @param pThis The instance. 384 * @param fActive Whether to active (@c true) or deactive. 384 385 * 385 386 * @remarks Owns the lock for the out-bound trunk port. -
trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
r58254 r58340 771 771 * @param pBuf The sk_buff. 772 772 * @param pSG The SG. 773 * @param pvFrame The frame pointer, optional.774 773 * @param cSegs The number of segments allocated for the SG. 775 774 * This should match the number in the mbuf exactly! 776 775 * @param fSrc The source of the frame. 777 * @param pGso 776 * @param pGsoCtx Pointer to the GSO context if it's a GSO 778 777 * internal network frame. NULL if regular frame. 779 778 */ … … 846 845 847 846 /** 848 * Packet handler, 849 * 850 * @returns 0 or EJUSTRETURN. 851 * @param pThis The instance. 852 * @param pMBuf The mbuf. 853 * @param pvFrame The start of the frame, optional. 854 * @param fSrc Where the packet (allegedly) comes from, one INTNETTRUNKDIR_* value. 855 * @param eProtocol The protocol. 847 * Packet handler; not really documented - figure it out yourself. 848 * 849 * @returns 0 or EJUSTRETURN - this is probably copy & pastry and thus wrong. 856 850 */ 857 851 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14) … … 1372 1366 1373 1367 /** 1374 * 1368 * I won't disclose what I do, figure it out yourself, including pThis referencing. 1369 * 1370 * @param pThis The net filter instance. 1375 1371 * @param pBuf The socket buffer. This is consumed by this function. 1376 1372 */ … … 1609 1605 * @returns VBox status code. 1610 1606 * @param pThis The instance. 1611 * @param fRediscovery If set we're doing a rediscovery attempt, so, don't 1612 * flood the release log. 1607 * @param pDev The device to attach to. 1613 1608 */ 1614 1609 static int vboxNetFltLinuxAttachToInterface(PVBOXNETFLTINS pThis, struct net_device *pDev) -
trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c
r57358 r58340 124 124 * Stream Driver hooks. 125 125 */ 126 static int VBoxNetFltSolarisGetInfo(dev_info_t *pDip, ddi_info_cmd_t enmCmd, void *pArg, void **pp Result);126 static int VBoxNetFltSolarisGetInfo(dev_info_t *pDip, ddi_info_cmd_t enmCmd, void *pArg, void **ppvResult); 127 127 static int VBoxNetFltSolarisAttach(dev_info_t *pDip, ddi_attach_cmd_t enmCmd); 128 128 static int VBoxNetFltSolarisDetach(dev_info_t *pDip, ddi_detach_cmd_t enmCmd); … … 718 718 * @returns corresponding solaris error code. 719 719 */ 720 static int VBoxNetFltSolarisGetInfo(dev_info_t *pDip, ddi_info_cmd_t enmCmd, void *pvArg, void **pp Result)720 static int VBoxNetFltSolarisGetInfo(dev_info_t *pDip, ddi_info_cmd_t enmCmd, void *pvArg, void **ppvResult) 721 721 { 722 722 LogFunc((DEVICE_NAME ":VBoxNetFltSolarisGetInfo pDip=%p enmCmd=%d pArg=%p instance=%d\n", pDip, enmCmd, … … 727 727 case DDI_INFO_DEVT2DEVINFO: 728 728 { 729 *pp Result = g_pVBoxNetFltSolarisDip;729 *ppvResult = g_pVBoxNetFltSolarisDip; 730 730 return DDI_SUCCESS; 731 731 } … … 734 734 { 735 735 int instance = getminor((dev_t)pvArg); 736 *pp Result = (void *)(uintptr_t)instance;736 *ppvResult = (void *)(uintptr_t)instance; 737 737 return DDI_SUCCESS; 738 738 } … … 1318 1318 * 1319 1319 * @returns VBox status code. 1320 * @param p QueuePointer to the read queue.1320 * @param pPromiscStream Pointer to the read queue. 1321 1321 */ 1322 1322 static int vboxNetFltSolarisSetRawMode(vboxnetflt_promisc_stream_t *pPromiscStream) … … 1822 1822 * 1823 1823 * @returns VBox status code. 1824 * @param pVNode Pointer to the device vnode. 1824 1825 * @param MuxId The multiplexor ID. 1825 1826 * @param pFd Where to store the lower stream file descriptor. … … 1909 1910 * 1910 1911 * @returns VBox status code. 1912 * @param fAttach Is this an attach or detach. 1911 1913 * @param pVNode Pointer to the lower stream vnode. 1912 1914 * @param pModPos Where to store the module position. … … 2645 2647 * Ipv6 dynamic attachment timer callback to attach to the Ipv6 stream if needed. 2646 2648 * 2647 * @param pT hisPointer to the timer.2649 * @param pTimer Pointer to the timer. 2648 2650 * @param pvData Opaque pointer to the instance. 2649 2651 * @param iTick Timer tick (unused). … … 2851 2853 * @param pThis The instance. 2852 2854 * @param pSG Pointer to the scatter-gather list. 2855 * @param fDst The destination mask, INTNETTRUNKDIR_XXX. Ignored. 2853 2856 */ 2854 2857 static mblk_t *vboxNetFltSolarisMBlkFromSG(PVBOXNETFLTINS pThis, PINTNETSG pSG, uint32_t fDst) … … 2967 2970 * @returns VBox status code. 2968 2971 * @param pMsg Pointer to the raw message. 2969 * @param p DlpiMsgWhere to store the M_PROTO message.2972 * @param ppDlpiMsg Where to store the M_PROTO message. 2970 2973 * 2971 2974 * @remarks The original raw message would be no longer valid and will be … … 3370 3373 * @param pStream Pointer to the stream. 3371 3374 * @param pQueue Pointer to the read queue. 3372 * @param p OrigMsgPointer to the message.3375 * @param pMsg Pointer to the message. 3373 3376 */ 3374 3377 static int vboxNetFltSolarisRecv(PVBOXNETFLTINS pThis, vboxnetflt_stream_t *pStream, queue_t *pQueue, mblk_t *pMsg) -
trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFltBow-solaris.c
r57867 r58340 121 121 LOCAL int VBoxNetFltSolarisAttach(dev_info_t *pDip, ddi_attach_cmd_t enmCmd); 122 122 LOCAL int VBoxNetFltSolarisDetach(dev_info_t *pDip, ddi_detach_cmd_t enmCmd); 123 LOCAL int VBoxNetFltSolarisGetInfo(dev_info_t *pDip, ddi_info_cmd_t enmCmd, void *pArg, void **pp Result);123 LOCAL int VBoxNetFltSolarisGetInfo(dev_info_t *pDip, ddi_info_cmd_t enmCmd, void *pArg, void **ppvResult); 124 124 125 125 … … 425 425 * @returns corresponding solaris error code. 426 426 */ 427 LOCAL int VBoxNetFltSolarisGetInfo(dev_info_t *pDip, ddi_info_cmd_t enmCmd, void *pvArg, void **pp Result)427 LOCAL int VBoxNetFltSolarisGetInfo(dev_info_t *pDip, ddi_info_cmd_t enmCmd, void *pvArg, void **ppvResult) 428 428 { 429 429 Log((DEVICE_NAME ":VBoxNetFltSolarisGetInfo pDip=%p enmCmd=%d pArg=%p instance=%d\n", pDip, enmCmd, getminor((dev_t)pvArg))); … … 433 433 case DDI_INFO_DEVT2DEVINFO: 434 434 { 435 *pp Result = g_pVBoxNetFltSolarisDip;435 *ppvResult = g_pVBoxNetFltSolarisDip; 436 436 return DDI_SUCCESS; 437 437 } … … 440 440 { 441 441 int instance = getminor((dev_t)pvArg); 442 *pp Result = (void *)(uintptr_t)instance;442 *ppvResult = (void *)(uintptr_t)instance; 443 443 return DDI_SUCCESS; 444 444 } … … 812 812 * @param pThis The instance. 813 813 * @param pVNIC Pointer to the VNIC. 814 * @param pVNICTemplate Pointer to the VNIC template initialize from, can be815 * NULL.816 814 * 817 815 * @returns VBox status code. -
trunk/src/VBox/HostDrivers/VBoxPci/VBoxPci.c
r58132 r58340 293 293 294 294 /** 295 * @interface_method_impl{RAWPCIDEVPORT,pfnUn apRegion}295 * @interface_method_impl{RAWPCIDEVPORT,pfnUnmapRegion} 296 296 */ 297 297 static DECLCALLBACK(int) vboxPciDevUnmapRegion(PRAWPCIDEVPORT pPort, -
trunk/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
r57594 r58340 883 883 * @param iIrq The IRQ number. 884 884 * @param pvDevId The device ID, a pointer to PVBOXRAWPCIINS. 885 * @param p vRegsRegister set. Removed in 2.6.19.885 * @param pRegs Register set. Removed in 2.6.19. 886 886 */ 887 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19) 887 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19) && !defined(DOXYGEN_RUNNING) 888 888 static irqreturn_t vboxPciOsIrqHandler(int iIrq, void *pvDevId) 889 889 #else -
trunk/src/VBox/HostDrivers/VBoxUSB/VBoxUSBFilterMgr.cpp
r57358 r58340 402 402 * 403 403 * @returns Owner on if matched, VBOXUSBFILTER_CONTEXT_NIL it not matched. 404 * @param pDevice The device data as a filter structure. 405 * See USBFilterMatch for how to construct this. 406 * @param puId Where to store the filter id (optional). 407 * @param pfFilter Where to store whether the device must be filtered or not 408 */ 409 VBOXUSBFILTER_CONTEXT VBoxUSBFilterMatchEx(PCUSBFILTER pDevice, uintptr_t *puId, bool fRemoveFltIfOneShot, bool *pfFilter, bool *pfIsOneShot) 404 * @param pDevice The device data as a filter structure. 405 * See USBFilterMatch for how to construct this. 406 * @param puId Where to store the filter id (optional). 407 * @param fRemoveFltIfOneShot Whether or not to remove one-shot filters on 408 * match. 409 * @param pfFilter Where to store whether the device must be filtered or not 410 * @param pfIsOneShot Where to return whetehr the match was a one-shot 411 * filter or not. Optional. 412 * 413 */ 414 VBOXUSBFILTER_CONTEXT VBoxUSBFilterMatchEx(PCUSBFILTER pDevice, uintptr_t *puId, 415 bool fRemoveFltIfOneShot, bool *pfFilter, bool *pfIsOneShot) 410 416 { 411 417 /* -
trunk/src/VBox/HostDrivers/VBoxUSB/VBoxUSBFilterMgr.h
r56293 r58340 23 23 RT_C_DECLS_BEGIN 24 24 25 /** @todo r=bird: VBOXUSBFILTER_CONTEXT isn't following the coding 26 * guildlines. Don't know which clueless dude did this... */ 25 27 #if defined(RT_OS_WINDOWS) 26 28 typedef struct VBOXUSBFLTCTX *VBOXUSBFILTER_CONTEXT; -
trunk/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSB-solaris.c
r57358 r58340 330 330 LOCAL bool vboxUSBSolarisIsUSBDevice(dev_info_t *pDip); 331 331 332 /** Device Operation Hooks */ 332 /** @name Device Operation Hooks 333 * @{ */ 333 334 LOCAL int vboxUSBSolarisSendURB(vboxusb_state_t *pState, PVBOXUSBREQ_URB pUrbReq, int Mode); 334 335 LOCAL int vboxUSBSolarisReapURB(vboxusb_state_t *pState, PVBOXUSBREQ_URB pUrbReq, int Mode); … … 340 341 LOCAL int vboxUSBSolarisAbortPipe(vboxusb_state_t *pState, uint8_t bEndpoint); 341 342 LOCAL int vboxUSBSolarisGetConfigIndex(vboxusb_state_t *pState, uint_t uCfgValue); 342 343 /** Hotplug & Power Management Hooks */ 343 /** @} */ 344 345 /** @name Hotplug & Power Management Hooks 346 * @{ */ 344 347 LOCAL inline void vboxUSBSolarisNotifyHotplug(vboxusb_state_t *pState); 345 348 LOCAL int vboxUSBSolarisDeviceDisconnected(dev_info_t *pDip); … … 353 356 LOCAL void vboxUSBSolarisPowerBusy(vboxusb_state_t *pState); 354 357 LOCAL void vboxUSBSolarisPowerIdle(vboxusb_state_t *pState); 355 356 /** Monitor Hooks */ 358 /** @} */ 359 360 /** @name Monitor Hooks 361 * @{ */ 357 362 int VBoxUSBMonSolarisRegisterClient(dev_info_t *pClientDip, PVBOXUSB_CLIENT_INFO pClientInfo); 358 363 int VBoxUSBMonSolarisUnregisterClient(dev_info_t *pClientDip); 359 360 /** Callbacks from Monitor */ 364 /** @} */ 365 366 /** @name Callbacks from Monitor 367 * @{ */ 361 368 LOCAL int vboxUSBSolarisSetConsumerCredentials(RTPROCESS Process, int Instance, void *pvReserved); 369 /** @} */ 362 370 363 371 … … 1551 1559 * Convert Solaris' USBA device state to VBox's error code. 1552 1560 * 1553 * @param UsbRc Solaris USBA error code.1561 * @param uDeviceState The USB device state to convert. 1554 1562 * 1555 1563 * @returns VBox error code. … … 2060 2068 * 2061 2069 * @param pState The USB device instance. 2062 * @param uCfgValue The Configuration value.2070 * @param bCfgValue The Configuration value. 2063 2071 * 2064 2072 * @returns VBox error code. … … 2216 2224 * 2217 2225 * @param pState The USB device instance. 2218 * @param ResetLevelThe reset level.2226 * @param enmReset The reset level. 2219 2227 * 2220 2228 * @returns VBox error code. … … 2350 2358 * @param pEpData The Endpoint data. 2351 2359 * @param uCfgValue The Configuration value. 2352 * @param uCfgIndex The Configuration index.2353 2360 * @param uInterface The Interface. 2354 2361 * @param uAlt The Alternate setting. … … 2357 2364 */ 2358 2365 LOCAL int vboxUSBSolarisInitEndPoint(vboxusb_state_t *pState, usb_ep_data_t *pEpData, uchar_t uCfgValue, 2359 uchar_t uInterface, uchar_t uAlt)2366 uchar_t uInterface, uchar_t uAlt) 2360 2367 { 2361 2368 LogFunc((DEVICE_NAME ":vboxUSBSolarisInitEndPoint pState=%p pEpData=%p CfgVal=%d Iface=%d Alt=%d", pState, … … 2815 2822 * 2816 2823 * @param pState The USB device instance. 2817 * @param pUrb The URB to initialize.2818 2824 * @param pUrbReq Opaque pointer to the complete request. 2819 * @param pMsg Pointer to the allocated request data.2820 2825 * 2821 2826 * @returns The allocated Isoc. In URB to be used. -
trunk/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSBMon-solaris.c
r57358 r58340 669 669 * 670 670 * @param iFunction The requested function. 671 * @param pvState Opaque pointer to driver state used for getting ring-3 process (Id). 672 * @param pvData The input/output data buffer. Can be NULL depending on the function. 671 * @param pvState Opaque pointer to driver state used for getting 672 * ring-3 process (Id). 673 * @param pvData The input/output data buffer. Can be NULL 674 * depending on the function. 673 675 * @param cbData The max size of the data buffer. 674 * @param pcbDataReturned Where to store the amount of returned data. Can be NULL. 676 * @param pcbReturnedData Where to store the amount of returned data. Can 677 * be NULL. 675 678 */ 676 679 static int vboxUSBMonSolarisProcessIOCtl(int iFunction, void *pvState, void *pvData, size_t cbData, size_t *pcbReturnedData) … … 904 907 * 905 908 * @returns VBox status code. 906 * @param pszDevicePath The device path of the client driver.907 * @param Instance The client driver instance.908 909 */ 909 910 int VBoxUSBMonSolarisRegisterClient(dev_info_t *pClientDip, PVBOXUSB_CLIENT_INFO pClientInfo) … … 933 934 return VINF_SUCCESS; 934 935 } 935 else 936 return VERR_NO_MEMORY; 937 } 938 else 939 return VERR_INVALID_STATE; 936 return VERR_NO_MEMORY; 937 } 938 return VERR_INVALID_STATE; 940 939 } 941 940 … … 945 944 * 946 945 * @returns VBox status code. 947 * @param pszDevicePath The device path of the client driver.948 * @param Instance The client driver instance.949 946 */ 950 947 int VBoxUSBMonSolarisUnregisterClient(dev_info_t *pClientDip) … … 985 982 return VERR_NOT_FOUND; 986 983 } 987 else 988 return VERR_INVALID_STATE; 984 return VERR_INVALID_STATE; 989 985 } 990 986
Note:
See TracChangeset
for help on using the changeset viewer.