Index: /trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku-stubs.c =================================================================== --- /trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku-stubs.c (revision 43365) +++ /trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku-stubs.c (revision 43366) @@ -64,9 +64,10 @@ #include -// >>> file('/tmp/stubs.c', 'w').writelines([re.sub(r'^(?P[^(]+) \(\*_(?P[A-Za-z0-9_]+)\)\((?P[^)]+)\);', lambda m: '%s %s(%s) {\n\t%sg_VBoxGuest->_%s(%s);\n}\n' % (m.group(1), m.group(2), m.group(3), ('return ' if m.group(1) != 'void' else ''), m.group(2), (', '.join(a.split(' ')[-1].replace('*', '') for a in m.group(3).split(',')) if m.group(3) != 'void' else '')), f) for f in functions]) +// >>> file('/tmp/stubs.c', 'w').writelines([re.sub(r'^(?P[^(]+) \(\*_(?P[A-Za-z0-9_]+)\)\((?P[^)]+)\);', lambda m: '%s %s(%s)\n{\n %sg_VBoxGuest->_%s(%s);\n}\n' % (m.group(1), m.group(2), m.group(3), ('return ' if m.group(1) != 'void' else ''), m.group(2), (', '.join(a.split(' ')[-1].replace('*', '') for a in m.group(3).split(',')) if m.group(3) != 'void' else '')), f) for f in functions]) struct vboxguest_module_info *g_VBoxGuest; -size_t RTLogBackdoorPrintf(const char *pszFormat, ...) { +size_t RTLogBackdoorPrintf(const char *pszFormat, ...) +{ va_list args; size_t cb; @@ -78,224 +79,298 @@ return cb; } -size_t RTLogBackdoorPrintfV(const char *pszFormat, va_list args) { +size_t RTLogBackdoorPrintfV(const char *pszFormat, va_list args) +{ return g_VBoxGuest->_RTLogBackdoorPrintfV(pszFormat, args); } -int RTLogSetDefaultInstanceThread(PRTLOGGER pLogger, uintptr_t uKey) { +int RTLogSetDefaultInstanceThread(PRTLOGGER pLogger, uintptr_t uKey) +{ return g_VBoxGuest->_RTLogSetDefaultInstanceThread(pLogger, uKey); } -int RTMemAllocExTag(size_t cb, size_t cbAlignment, uint32_t fFlags, const char *pszTag, void **ppv) { +int RTMemAllocExTag(size_t cb, size_t cbAlignment, uint32_t fFlags, const char *pszTag, void **ppv) +{ return g_VBoxGuest->_RTMemAllocExTag(cb, cbAlignment, fFlags, pszTag, ppv); } -void * RTMemContAlloc(PRTCCPHYS pPhys, size_t cb) { +void* RTMemContAlloc(PRTCCPHYS pPhys, size_t cb) +{ return g_VBoxGuest->_RTMemContAlloc(pPhys, cb); } -void RTMemContFree(void *pv, size_t cb) { +void RTMemContFree(void *pv, size_t cb) +{ g_VBoxGuest->_RTMemContFree(pv, cb); } -void RTMemFreeEx(void *pv, size_t cb) { +void RTMemFreeEx(void *pv, size_t cb) +{ g_VBoxGuest->_RTMemFreeEx(pv, cb); } -bool RTMpIsCpuPossible(RTCPUID idCpu) { +bool RTMpIsCpuPossible(RTCPUID idCpu) +{ return g_VBoxGuest->_RTMpIsCpuPossible(idCpu); } -int RTMpNotificationDeregister(PFNRTMPNOTIFICATION pfnCallback, void *pvUser) { +int RTMpNotificationDeregister(PFNRTMPNOTIFICATION pfnCallback, void *pvUser) +{ return g_VBoxGuest->_RTMpNotificationDeregister(pfnCallback, pvUser); } -int RTMpNotificationRegister(PFNRTMPNOTIFICATION pfnCallback, void *pvUser) { +int RTMpNotificationRegister(PFNRTMPNOTIFICATION pfnCallback, void *pvUser) +{ return g_VBoxGuest->_RTMpNotificationRegister(pfnCallback, pvUser); } -int RTMpOnAll(PFNRTMPWORKER pfnWorker, void *pvUser1, void *pvUser2) { +int RTMpOnAll(PFNRTMPWORKER pfnWorker, void *pvUser1, void *pvUser2) +{ return g_VBoxGuest->_RTMpOnAll(pfnWorker, pvUser1, pvUser2); } -int RTMpOnOthers(PFNRTMPWORKER pfnWorker, void *pvUser1, void *pvUser2) { +int RTMpOnOthers(PFNRTMPWORKER pfnWorker, void *pvUser1, void *pvUser2) +{ return g_VBoxGuest->_RTMpOnOthers(pfnWorker, pvUser1, pvUser2); } -int RTMpOnSpecific(RTCPUID idCpu, PFNRTMPWORKER pfnWorker, void *pvUser1, void *pvUser2) { +int RTMpOnSpecific(RTCPUID idCpu, PFNRTMPWORKER pfnWorker, void *pvUser1, void *pvUser2) +{ return g_VBoxGuest->_RTMpOnSpecific(idCpu, pfnWorker, pvUser1, pvUser2); } -int RTPowerNotificationDeregister(PFNRTPOWERNOTIFICATION pfnCallback, void *pvUser) { +int RTPowerNotificationDeregister(PFNRTPOWERNOTIFICATION pfnCallback, void *pvUser) +{ return g_VBoxGuest->_RTPowerNotificationDeregister(pfnCallback, pvUser); } -int RTPowerNotificationRegister(PFNRTPOWERNOTIFICATION pfnCallback, void *pvUser) { +int RTPowerNotificationRegister(PFNRTPOWERNOTIFICATION pfnCallback, void *pvUser) +{ return g_VBoxGuest->_RTPowerNotificationRegister(pfnCallback, pvUser); } -int RTPowerSignalEvent(RTPOWEREVENT enmEvent) { +int RTPowerSignalEvent(RTPOWEREVENT enmEvent) +{ return g_VBoxGuest->_RTPowerSignalEvent(enmEvent); } -void RTR0AssertPanicSystem(void) { +void RTR0AssertPanicSystem(void) +{ g_VBoxGuest->_RTR0AssertPanicSystem(); } -int RTR0Init(unsigned fReserved) { +int RTR0Init(unsigned fReserved) +{ return g_VBoxGuest->_RTR0Init(fReserved); } -void * RTR0MemObjAddress(RTR0MEMOBJ MemObj) { +void* RTR0MemObjAddress(RTR0MEMOBJ MemObj) +{ return g_VBoxGuest->_RTR0MemObjAddress(MemObj); } -RTR3PTR RTR0MemObjAddressR3(RTR0MEMOBJ MemObj) { +RTR3PTR RTR0MemObjAddressR3(RTR0MEMOBJ MemObj) +{ return g_VBoxGuest->_RTR0MemObjAddressR3(MemObj); } -int RTR0MemObjAllocContTag(PRTR0MEMOBJ pMemObj, size_t cb, bool fExecutable, const char *pszTag) { +int RTR0MemObjAllocContTag(PRTR0MEMOBJ pMemObj, size_t cb, bool fExecutable, const char *pszTag) +{ return g_VBoxGuest->_RTR0MemObjAllocContTag(pMemObj, cb, fExecutable, pszTag); } -int RTR0MemObjAllocLowTag(PRTR0MEMOBJ pMemObj, size_t cb, bool fExecutable, const char *pszTag) { +int RTR0MemObjAllocLowTag(PRTR0MEMOBJ pMemObj, size_t cb, bool fExecutable, const char *pszTag) +{ return g_VBoxGuest->_RTR0MemObjAllocLowTag(pMemObj, cb, fExecutable, pszTag); } -int RTR0MemObjAllocPageTag(PRTR0MEMOBJ pMemObj, size_t cb, bool fExecutable, const char *pszTag) { +int RTR0MemObjAllocPageTag(PRTR0MEMOBJ pMemObj, size_t cb, bool fExecutable, const char *pszTag) +{ return g_VBoxGuest->_RTR0MemObjAllocPageTag(pMemObj, cb, fExecutable, pszTag); } -int RTR0MemObjAllocPhysExTag(PRTR0MEMOBJ pMemObj, size_t cb, RTHCPHYS PhysHighest, size_t uAlignment, const char *pszTag) { +int RTR0MemObjAllocPhysExTag(PRTR0MEMOBJ pMemObj, size_t cb, RTHCPHYS PhysHighest, size_t uAlignment, const char *pszTag) +{ return g_VBoxGuest->_RTR0MemObjAllocPhysExTag(pMemObj, cb, PhysHighest, uAlignment, pszTag); } -int RTR0MemObjAllocPhysNCTag(PRTR0MEMOBJ pMemObj, size_t cb, RTHCPHYS PhysHighest, const char *pszTag) { +int RTR0MemObjAllocPhysNCTag(PRTR0MEMOBJ pMemObj, size_t cb, RTHCPHYS PhysHighest, const char *pszTag) +{ return g_VBoxGuest->_RTR0MemObjAllocPhysNCTag(pMemObj, cb, PhysHighest, pszTag); } -int RTR0MemObjAllocPhysTag(PRTR0MEMOBJ pMemObj, size_t cb, RTHCPHYS PhysHighest, const char *pszTag) { +int RTR0MemObjAllocPhysTag(PRTR0MEMOBJ pMemObj, size_t cb, RTHCPHYS PhysHighest, const char *pszTag) +{ return g_VBoxGuest->_RTR0MemObjAllocPhysTag(pMemObj, cb, PhysHighest, pszTag); } -int RTR0MemObjEnterPhysTag(PRTR0MEMOBJ pMemObj, RTHCPHYS Phys, size_t cb, uint32_t uCachePolicy, const char *pszTag) { +int RTR0MemObjEnterPhysTag(PRTR0MEMOBJ pMemObj, RTHCPHYS Phys, size_t cb, uint32_t uCachePolicy, const char *pszTag) +{ return g_VBoxGuest->_RTR0MemObjEnterPhysTag(pMemObj, Phys, cb, uCachePolicy, pszTag); } -int RTR0MemObjFree(RTR0MEMOBJ MemObj, bool fFreeMappings) { +int RTR0MemObjFree(RTR0MEMOBJ MemObj, bool fFreeMappings) +{ return g_VBoxGuest->_RTR0MemObjFree(MemObj, fFreeMappings); } -RTHCPHYS RTR0MemObjGetPagePhysAddr(RTR0MEMOBJ MemObj, size_t iPage) { +RTHCPHYS RTR0MemObjGetPagePhysAddr(RTR0MEMOBJ MemObj, size_t iPage) +{ return g_VBoxGuest->_RTR0MemObjGetPagePhysAddr(MemObj, iPage); } -bool RTR0MemObjIsMapping(RTR0MEMOBJ MemObj) { +bool RTR0MemObjIsMapping(RTR0MEMOBJ MemObj) +{ return g_VBoxGuest->_RTR0MemObjIsMapping(MemObj); } -int RTR0MemObjLockKernelTag(PRTR0MEMOBJ pMemObj, void *pv, size_t cb, uint32_t fAccess, const char *pszTag) { +int RTR0MemObjLockKernelTag(PRTR0MEMOBJ pMemObj, void *pv, size_t cb, uint32_t fAccess, const char *pszTag) +{ return g_VBoxGuest->_RTR0MemObjLockKernelTag(pMemObj, pv, cb, fAccess, pszTag); } -int RTR0MemObjLockUserTag(PRTR0MEMOBJ pMemObj, RTR3PTR R3Ptr, size_t cb, uint32_t fAccess, RTR0PROCESS R0Process, const char *pszTag) { +int RTR0MemObjLockUserTag(PRTR0MEMOBJ pMemObj, RTR3PTR R3Ptr, size_t cb, uint32_t fAccess, RTR0PROCESS R0Process, const char *pszTag) +{ return g_VBoxGuest->_RTR0MemObjLockUserTag(pMemObj, R3Ptr, cb, fAccess, R0Process, pszTag); } -int RTR0MemObjMapKernelExTag(PRTR0MEMOBJ pMemObj, RTR0MEMOBJ MemObjToMap, void *pvFixed, size_t uAlignment, unsigned fProt, size_t offSub, size_t cbSub, const char *pszTag) { +int RTR0MemObjMapKernelExTag(PRTR0MEMOBJ pMemObj, RTR0MEMOBJ MemObjToMap, void *pvFixed, size_t uAlignment, unsigned fProt, size_t offSub, size_t cbSub, const char *pszTag) +{ return g_VBoxGuest->_RTR0MemObjMapKernelExTag(pMemObj, MemObjToMap, pvFixed, uAlignment, fProt, offSub, cbSub, pszTag); } -int RTR0MemObjMapKernelTag(PRTR0MEMOBJ pMemObj, RTR0MEMOBJ MemObjToMap, void *pvFixed, size_t uAlignment, unsigned fProt, const char *pszTag) { +int RTR0MemObjMapKernelTag(PRTR0MEMOBJ pMemObj, RTR0MEMOBJ MemObjToMap, void *pvFixed, size_t uAlignment, unsigned fProt, const char *pszTag) +{ return g_VBoxGuest->_RTR0MemObjMapKernelTag(pMemObj, MemObjToMap, pvFixed, uAlignment, fProt, pszTag); } -int RTR0MemObjMapUserTag(PRTR0MEMOBJ pMemObj, RTR0MEMOBJ MemObjToMap, RTR3PTR R3PtrFixed, size_t uAlignment, unsigned fProt, RTR0PROCESS R0Process, const char *pszTag) { +int RTR0MemObjMapUserTag(PRTR0MEMOBJ pMemObj, RTR0MEMOBJ MemObjToMap, RTR3PTR R3PtrFixed, size_t uAlignment, unsigned fProt, RTR0PROCESS R0Process, const char *pszTag) +{ return g_VBoxGuest->_RTR0MemObjMapUserTag(pMemObj, MemObjToMap, R3PtrFixed, uAlignment, fProt, R0Process, pszTag); } -int RTR0MemObjProtect(RTR0MEMOBJ hMemObj, size_t offSub, size_t cbSub, uint32_t fProt) { +int RTR0MemObjProtect(RTR0MEMOBJ hMemObj, size_t offSub, size_t cbSub, uint32_t fProt) +{ return g_VBoxGuest->_RTR0MemObjProtect(hMemObj, offSub, cbSub, fProt); } -int RTR0MemObjReserveKernelTag(PRTR0MEMOBJ pMemObj, void *pvFixed, size_t cb, size_t uAlignment, const char *pszTag) { +int RTR0MemObjReserveKernelTag(PRTR0MEMOBJ pMemObj, void *pvFixed, size_t cb, size_t uAlignment, const char *pszTag) +{ return g_VBoxGuest->_RTR0MemObjReserveKernelTag(pMemObj, pvFixed, cb, uAlignment, pszTag); } -int RTR0MemObjReserveUserTag(PRTR0MEMOBJ pMemObj, RTR3PTR R3PtrFixed, size_t cb, size_t uAlignment, RTR0PROCESS R0Process, const char *pszTag) { +int RTR0MemObjReserveUserTag(PRTR0MEMOBJ pMemObj, RTR3PTR R3PtrFixed, size_t cb, size_t uAlignment, RTR0PROCESS R0Process, const char *pszTag) +{ return g_VBoxGuest->_RTR0MemObjReserveUserTag(pMemObj, R3PtrFixed, cb, uAlignment, R0Process, pszTag); } -size_t RTR0MemObjSize(RTR0MEMOBJ MemObj) { +size_t RTR0MemObjSize(RTR0MEMOBJ MemObj) +{ return g_VBoxGuest->_RTR0MemObjSize(MemObj); } -RTR0PROCESS RTR0ProcHandleSelf(void) { +RTR0PROCESS RTR0ProcHandleSelf(void) +{ return g_VBoxGuest->_RTR0ProcHandleSelf(); } -void RTR0Term(void) { +void RTR0Term(void) +{ g_VBoxGuest->_RTR0Term(); } -void RTR0TermForced(void) { +void RTR0TermForced(void) +{ g_VBoxGuest->_RTR0TermForced(); } -RTPROCESS RTProcSelf(void) { - return g_VBoxGuest->_RTProcSelf(); -} -uint32_t RTSemEventGetResolution(void) { +RTPROCESS RTProcSelf(void) +{ + return g_VBoxGuest->_RTProcSelf(); +} +uint32_t RTSemEventGetResolution(void) +{ return g_VBoxGuest->_RTSemEventGetResolution(); } -uint32_t RTSemEventMultiGetResolution(void) { +uint32_t RTSemEventMultiGetResolution(void) +{ return g_VBoxGuest->_RTSemEventMultiGetResolution(); } -int RTSemEventMultiWaitEx(RTSEMEVENTMULTI hEventMultiSem, uint32_t fFlags, uint64_t uTimeout) { +int RTSemEventMultiWaitEx(RTSEMEVENTMULTI hEventMultiSem, uint32_t fFlags, uint64_t uTimeout) +{ return g_VBoxGuest->_RTSemEventMultiWaitEx(hEventMultiSem, fFlags, uTimeout); } -int RTSemEventMultiWaitExDebug(RTSEMEVENTMULTI hEventMultiSem, uint32_t fFlags, uint64_t uTimeout, RTHCUINTPTR uId, RT_SRC_POS_DECL) { +int RTSemEventMultiWaitExDebug(RTSEMEVENTMULTI hEventMultiSem, uint32_t fFlags, uint64_t uTimeout, RTHCUINTPTR uId, RT_SRC_POS_DECL) +{ return g_VBoxGuest->_RTSemEventMultiWaitExDebug(hEventMultiSem, fFlags, uTimeout, uId, pszFile, iLine, pszFunction); } -int RTSemEventWaitEx(RTSEMEVENT hEventSem, uint32_t fFlags, uint64_t uTimeout) { +int RTSemEventWaitEx(RTSEMEVENT hEventSem, uint32_t fFlags, uint64_t uTimeout) +{ return g_VBoxGuest->_RTSemEventWaitEx(hEventSem, fFlags, uTimeout); } -int RTSemEventWaitExDebug(RTSEMEVENT hEventSem, uint32_t fFlags, uint64_t uTimeout, RTHCUINTPTR uId, RT_SRC_POS_DECL) { +int RTSemEventWaitExDebug(RTSEMEVENT hEventSem, uint32_t fFlags, uint64_t uTimeout, RTHCUINTPTR uId, RT_SRC_POS_DECL) +{ return g_VBoxGuest->_RTSemEventWaitExDebug(hEventSem, fFlags, uTimeout, uId, pszFile, iLine, pszFunction); } -bool RTThreadIsInInterrupt(RTTHREAD hThread) { +bool RTThreadIsInInterrupt(RTTHREAD hThread) +{ return g_VBoxGuest->_RTThreadIsInInterrupt(hThread); } -void RTThreadPreemptDisable(PRTTHREADPREEMPTSTATE pState) { +void RTThreadPreemptDisable(PRTTHREADPREEMPTSTATE pState) +{ g_VBoxGuest->_RTThreadPreemptDisable(pState); } -bool RTThreadPreemptIsEnabled(RTTHREAD hThread) { +bool RTThreadPreemptIsEnabled(RTTHREAD hThread) +{ return g_VBoxGuest->_RTThreadPreemptIsEnabled(hThread); } -bool RTThreadPreemptIsPending(RTTHREAD hThread) { +bool RTThreadPreemptIsPending(RTTHREAD hThread) +{ return g_VBoxGuest->_RTThreadPreemptIsPending(hThread); } -bool RTThreadPreemptIsPendingTrusty(void) { +bool RTThreadPreemptIsPendingTrusty(void) +{ return g_VBoxGuest->_RTThreadPreemptIsPendingTrusty(); } -bool RTThreadPreemptIsPossible(void) { +bool RTThreadPreemptIsPossible(void) +{ return g_VBoxGuest->_RTThreadPreemptIsPossible(); } -void RTThreadPreemptRestore(PRTTHREADPREEMPTSTATE pState) { +void RTThreadPreemptRestore(PRTTHREADPREEMPTSTATE pState) +{ g_VBoxGuest->_RTThreadPreemptRestore(pState); } -uint32_t RTTimerGetSystemGranularity(void) { +uint32_t RTTimerGetSystemGranularity(void) +{ return g_VBoxGuest->_RTTimerGetSystemGranularity(); } -int RTTimerReleaseSystemGranularity(uint32_t u32Granted) { +int RTTimerReleaseSystemGranularity(uint32_t u32Granted) +{ return g_VBoxGuest->_RTTimerReleaseSystemGranularity(u32Granted); } -int RTTimerRequestSystemGranularity(uint32_t u32Request, uint32_t *pu32Granted) { +int RTTimerRequestSystemGranularity(uint32_t u32Request, uint32_t *pu32Granted) +{ return g_VBoxGuest->_RTTimerRequestSystemGranularity(u32Request, pu32Granted); } -void RTSpinlockAcquire(RTSPINLOCK Spinlock) { +void RTSpinlockAcquire(RTSPINLOCK Spinlock) +{ g_VBoxGuest->_RTSpinlockAcquire(Spinlock); } -void RTSpinlockRelease(RTSPINLOCK Spinlock) { +void RTSpinlockRelease(RTSPINLOCK Spinlock) +{ g_VBoxGuest->_RTSpinlockRelease(Spinlock); } -void RTSpinlockReleaseNoInts(RTSPINLOCK Spinlock) { +void RTSpinlockReleaseNoInts(RTSPINLOCK Spinlock) +{ g_VBoxGuest->_RTSpinlockReleaseNoInts(Spinlock); } -void * RTMemTmpAllocTag(size_t cb, const char *pszTag) { +void* RTMemTmpAllocTag(size_t cb, const char *pszTag) +{ return g_VBoxGuest->_RTMemTmpAllocTag(cb, pszTag); } -void RTMemTmpFree(void *pv) { +void RTMemTmpFree(void *pv) +{ g_VBoxGuest->_RTMemTmpFree(pv); } -PRTLOGGER RTLogDefaultInstance(void) { +PRTLOGGER RTLogDefaultInstance(void) +{ return g_VBoxGuest->_RTLogDefaultInstance(); } -PRTLOGGER RTLogRelDefaultInstance(void) { +PRTLOGGER RTLogRelDefaultInstance(void) +{ return g_VBoxGuest->_RTLogRelDefaultInstance(); } -int RTErrConvertToErrno(int iErr) { +int RTErrConvertToErrno(int iErr) +{ return g_VBoxGuest->_RTErrConvertToErrno(iErr); } -int VBoxGuestCommonIOCtl(unsigned iFunction, PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION pSession, void *pvData, size_t cbData, size_t *pcbDataReturned) { +int VBoxGuestCommonIOCtl(unsigned iFunction, PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION pSession, void *pvData, size_t cbData, size_t *pcbDataReturned) +{ return g_VBoxGuest->_VBoxGuestCommonIOCtl(iFunction, pDevExt, pSession, pvData, cbData, pcbDataReturned); } -int VBoxGuestCreateUserSession(PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION *ppSession) { +int VBoxGuestCreateUserSession(PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION *ppSession) +{ return g_VBoxGuest->_VBoxGuestCreateUserSession(pDevExt, ppSession); } -void VBoxGuestCloseSession(PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION pSession) { +void VBoxGuestCloseSession(PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION pSession) +{ g_VBoxGuest->_VBoxGuestCloseSession(pDevExt, pSession); } -void * VBoxGuestIDCOpen(uint32_t *pu32Version) { +void* VBoxGuestIDCOpen(uint32_t *pu32Version) +{ return g_VBoxGuest->_VBoxGuestIDCOpen(pu32Version); } -int VBoxGuestIDCClose(void *pvSession) { +int VBoxGuestIDCClose(void *pvSession) +{ return g_VBoxGuest->_VBoxGuestIDCClose(pvSession); } -int VBoxGuestIDCCall(void *pvSession, unsigned iCmd, void *pvData, size_t cbData, size_t *pcbDataReturned) { +int VBoxGuestIDCCall(void *pvSession, unsigned iCmd, void *pvData, size_t cbData, size_t *pcbDataReturned) +{ return g_VBoxGuest->_VBoxGuestIDCCall(pvSession, iCmd, pvData, cbData, pcbDataReturned); } -void RTAssertMsg1Weak(const char *pszExpr, unsigned uLine, const char *pszFile, const char *pszFunction) { +void RTAssertMsg1Weak(const char *pszExpr, unsigned uLine, const char *pszFile, const char *pszFunction) +{ g_VBoxGuest->_RTAssertMsg1Weak(pszExpr, uLine, pszFile, pszFunction); } -void RTAssertMsg2Weak(const char *pszFormat, ...) { +void RTAssertMsg2Weak(const char *pszFormat, ...) +{ va_list va; va_start(va, pszFormat); @@ -303,53 +378,70 @@ va_end(va); } -void RTAssertMsg2WeakV(const char *pszFormat, va_list va) { +void RTAssertMsg2WeakV(const char *pszFormat, va_list va) +{ g_VBoxGuest->_RTAssertMsg2WeakV(pszFormat, va); } -bool RTAssertShouldPanic(void) { +bool RTAssertShouldPanic(void) +{ return g_VBoxGuest->_RTAssertShouldPanic(); } -int RTSemFastMutexCreate(PRTSEMFASTMUTEX phFastMtx) { +int RTSemFastMutexCreate(PRTSEMFASTMUTEX phFastMtx) +{ return g_VBoxGuest->_RTSemFastMutexCreate(phFastMtx); } -int RTSemFastMutexDestroy(RTSEMFASTMUTEX hFastMtx) { +int RTSemFastMutexDestroy(RTSEMFASTMUTEX hFastMtx) +{ return g_VBoxGuest->_RTSemFastMutexDestroy(hFastMtx); } -int RTSemFastMutexRelease(RTSEMFASTMUTEX hFastMtx) { +int RTSemFastMutexRelease(RTSEMFASTMUTEX hFastMtx) +{ return g_VBoxGuest->_RTSemFastMutexRelease(hFastMtx); } -int RTSemFastMutexRequest(RTSEMFASTMUTEX hFastMtx) { +int RTSemFastMutexRequest(RTSEMFASTMUTEX hFastMtx) +{ return g_VBoxGuest->_RTSemFastMutexRequest(hFastMtx); } -int RTSemMutexCreate(PRTSEMMUTEX phFastMtx) { +int RTSemMutexCreate(PRTSEMMUTEX phFastMtx) +{ return g_VBoxGuest->_RTSemMutexCreate(phFastMtx); } -int RTSemMutexDestroy(RTSEMMUTEX hFastMtx) { +int RTSemMutexDestroy(RTSEMMUTEX hFastMtx) +{ return g_VBoxGuest->_RTSemMutexDestroy(hFastMtx); } -int RTSemMutexRelease(RTSEMMUTEX hFastMtx) { +int RTSemMutexRelease(RTSEMMUTEX hFastMtx) +{ return g_VBoxGuest->_RTSemMutexRelease(hFastMtx); } -int RTSemMutexRequest(RTSEMMUTEX hFastMtx, RTMSINTERVAL cMillies) { +int RTSemMutexRequest(RTSEMMUTEX hFastMtx, RTMSINTERVAL cMillies) +{ return g_VBoxGuest->_RTSemMutexRequest(hFastMtx, cMillies); } -int RTHeapSimpleRelocate(RTHEAPSIMPLE hHeap, uintptr_t offDelta) { +int RTHeapSimpleRelocate(RTHEAPSIMPLE hHeap, uintptr_t offDelta) +{ return g_VBoxGuest->_RTHeapSimpleRelocate(hHeap, offDelta); } -int RTHeapOffsetInit(PRTHEAPOFFSET phHeap, void *pvMemory, size_t cbMemory) { +int RTHeapOffsetInit(PRTHEAPOFFSET phHeap, void *pvMemory, size_t cbMemory) +{ return g_VBoxGuest->_RTHeapOffsetInit(phHeap, pvMemory, cbMemory); } -int RTHeapSimpleInit(PRTHEAPSIMPLE pHeap, void *pvMemory, size_t cbMemory) { +int RTHeapSimpleInit(PRTHEAPSIMPLE pHeap, void *pvMemory, size_t cbMemory) +{ return g_VBoxGuest->_RTHeapSimpleInit(pHeap, pvMemory, cbMemory); } -void * RTHeapOffsetAlloc(RTHEAPOFFSET hHeap, size_t cb, size_t cbAlignment) { +void* RTHeapOffsetAlloc(RTHEAPOFFSET hHeap, size_t cb, size_t cbAlignment) +{ return g_VBoxGuest->_RTHeapOffsetAlloc(hHeap, cb, cbAlignment); } -void * RTHeapSimpleAlloc(RTHEAPSIMPLE Heap, size_t cb, size_t cbAlignment) { +void* RTHeapSimpleAlloc(RTHEAPSIMPLE Heap, size_t cb, size_t cbAlignment) +{ return g_VBoxGuest->_RTHeapSimpleAlloc(Heap, cb, cbAlignment); } -void RTHeapOffsetFree(RTHEAPOFFSET hHeap, void *pv) { +void RTHeapOffsetFree(RTHEAPOFFSET hHeap, void *pv) +{ g_VBoxGuest->_RTHeapOffsetFree(hHeap, pv); } -void RTHeapSimpleFree(RTHEAPSIMPLE Heap, void *pv) { +void RTHeapSimpleFree(RTHEAPSIMPLE Heap, void *pv) +{ g_VBoxGuest->_RTHeapSimpleFree(Heap, pv); } Index: /trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c =================================================================== --- /trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c (revision 43365) +++ /trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c (revision 43366) @@ -105,5 +105,6 @@ static pci_module_info *gPCI; -static struct vboxguest_module_info g_VBoxGuest = { +static struct vboxguest_module_info g_VBoxGuest = +{ { MODULE_NAME, @@ -111,6 +112,6 @@ std_ops }, - {0}, - {0}, + { 0 }, + { 0 }, 0, RTLogBackdoorPrintf, @@ -224,9 +225,9 @@ */ if (!ppDev) - return; + return; if (strcmp(pszName, "vboxguest") == 0) - iUnit = -1; + iUnit = -1; else if (dev_stdclone(pszName, NULL, "vboxguest", &iUnit) != 1) - return; + return; if (iUnit >= 256) { @@ -252,13 +253,13 @@ (*ppDev)->si_flags |= SI_CHEAPCLONE; Log(("VBoxGuestHaikuClone: Created *ppDev=%p iUnit=%d si_drv1=%p si_drv2=%p\n", - *ppDev, iUnit, (*ppDev)->si_drv1, (*ppDev)->si_drv2)); + *ppDev, iUnit, (*ppDev)->si_drv1, (*ppDev)->si_drv2)); (*ppDev)->si_drv1 = (*ppDev)->si_drv2 = NULL; } else - Log(("VBoxGuestHaikuClone: make_dev iUnit=%d failed\n", iUnit)); + Log(("VBoxGuestHaikuClone: make_dev iUnit=%d failed\n", iUnit)); } else - Log(("VBoxGuestHaikuClone: Existing *ppDev=%p iUnit=%d si_drv1=%p si_drv2=%p\n", - *ppDev, iUnit, (*ppDev)->si_drv1, (*ppDev)->si_drv2)); + Log(("VBoxGuestHaikuClone: Existing *ppDev=%p iUnit=%d si_drv1=%p si_drv2=%p\n", + *ppDev, iUnit, (*ppDev)->si_drv1, (*ppDev)->si_drv2)); } #endif @@ -296,4 +297,5 @@ } + /** * Interrupt service routine. @@ -310,4 +312,5 @@ return fOurIRQ ? B_HANDLED_INTERRUPT : B_UNHANDLED_INTERRUPT; } + void VBoxGuestNativeISRMousePollEvent(PVBOXGUESTDEVEXT pDevExt) @@ -325,5 +328,6 @@ RTSpinlockAcquire(g_Spinlock); - if (sState.selectSync) { + if (sState.selectSync) + { //dprintf(MODULE_NAME ": isr mouse: notify\n"); notify_select_event(sState.selectSync, sState.selectEvent); @@ -331,9 +335,11 @@ sState.selectRef = (uint32_t)0; sState.selectSync = NULL; - } else + } + else err = B_ERROR; RTSpinlockRelease(g_Spinlock); } + /** @@ -358,4 +364,5 @@ } + /** * Removes IRQ for VMMDev. @@ -369,4 +376,5 @@ remove_io_interrupt_handler(pState->iIrqResId, VBoxGuestHaikuISR, pState); } + static status_t VBoxGuestHaikuAttach(const pci_info *pDevice) @@ -376,5 +384,5 @@ int iResId = 0; struct VBoxGuestDeviceState *pState = &sState; - static const char * const s_apszGroups[] = VBOX_LOGGROUP_NAMES; + static const char *const s_apszGroups[] = VBOX_LOGGROUP_NAMES; PRTLOGGER pRelLogger; @@ -387,5 +395,5 @@ if (RT_FAILURE(rc)) { - /** @todo r=ramshankar: use dprintf here */ + /** @todo r=ramshankar: use dprintf here */ LogFunc(("RTR0Init failed.\n")); return ENXIO; @@ -395,6 +403,6 @@ if (RT_FAILURE(rc)) { - LogRel(("VBoxGuestHaikuAttach: RTSpinlock create failed. rc=%Rrc\n", rc)); - return ENXIO; + LogRel(("VBoxGuestHaikuAttach: RTSpinlock create failed. rc=%Rrc\n", rc)); + return ENXIO; } @@ -405,8 +413,8 @@ * early failures using the LogRel macro.) */ - rc = RTLogCreate(&pRelLogger, 0|RTLOGFLAGS_PREFIX_THREAD /* fFlags */, "all", + rc = RTLogCreate(&pRelLogger, 0 | RTLOGFLAGS_PREFIX_THREAD /* fFlags */, "all", "VBOX_RELEASE_LOG", RT_ELEMENTS(s_apszGroups), s_apszGroups, RTLOGDEST_STDOUT | RTLOGDEST_DEBUGGER | RTLOGDEST_USER, NULL); -dprintf(MODULE_NAME ": RTLogCreate: %d\n", rc); + dprintf(MODULE_NAME ": RTLogCreate: %d\n", rc); if (RT_SUCCESS(rc)) { @@ -415,5 +423,5 @@ //RTLogDestinations(pRelLogger, "/var/log/vboxguest.log"); RTLogRelSetDefaultInstance(pRelLogger); - RTLogSetDefaultInstance(pRelLogger);//XXX + RTLogSetDefaultInstance(pRelLogger); //XXX } #endif @@ -436,6 +444,6 @@ pState->VMMDevMemSize = pDevice->u.h0.base_register_sizes[1]; pState->iVMMDevMemAreaId = map_physical_memory("VirtualBox Guest MMIO", - phys, pState->VMMDevMemSize, B_ANY_KERNEL_BLOCK_ADDRESS, - B_KERNEL_READ_AREA | B_KERNEL_WRITE_AREA, &pState->pMMIOBase); + phys, pState->VMMDevMemSize, B_ANY_KERNEL_BLOCK_ADDRESS, + B_KERNEL_READ_AREA | B_KERNEL_WRITE_AREA, &pState->pMMIOBase); if (pState->iVMMDevMemAreaId > 0 && pState->pMMIOBase) @@ -481,4 +489,5 @@ } + static status_t VBoxGuestHaikuProbe(pci_info *pDevice) { @@ -488,4 +497,5 @@ return ENXIO; } + status_t init_module(void) @@ -498,6 +508,8 @@ return ENOSYS; - while ((*gPCI->get_nth_pci_info)(ix++, &info) == B_OK) { - if (VBoxGuestHaikuProbe(&info) == 0) { + while ((*gPCI->get_nth_pci_info)(ix++, &info) == B_OK) + { + if (VBoxGuestHaikuProbe(&info) == 0) + { // we found it status = VBoxGuestHaikuAttach(&info); @@ -509,4 +521,5 @@ } + void uninit_module(void) { @@ -516,20 +529,25 @@ } -static status_t std_ops(int32 op, ...) { - switch(op) { - case B_MODULE_INIT: - dprintf(MODULE_NAME ": B_MODULE_INIT\n"); - return init_module(); - case B_MODULE_UNINIT: - dprintf(MODULE_NAME ": B_MODULE_UNINIT\n"); - uninit_module(); - return B_OK; - default: - return B_ERROR; - } -} - -_EXPORT module_info *modules[] = { - (module_info*) &g_VBoxGuest, + +static status_t std_ops(int32 op, ...) +{ + switch (op) + { + case B_MODULE_INIT: + dprintf(MODULE_NAME ": B_MODULE_INIT\n"); + return init_module(); + case B_MODULE_UNINIT: + dprintf(MODULE_NAME ": B_MODULE_UNINIT\n"); + uninit_module(); + return B_OK; + default: + return B_ERROR; + } +} + + +_EXPORT module_info *modules[] = +{ + (module_info *)&g_VBoxGuest, NULL }; @@ -537,2 +555,3 @@ /* Common code that depend on g_DevExt. */ #include "VBoxGuestIDC-unix.c.h" + Index: /trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.h =================================================================== --- /trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.h (revision 43365) +++ /trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.h (revision 43366) @@ -101,5 +101,6 @@ }; -struct vboxguest_module_info { +struct vboxguest_module_info +{ module_info module; @@ -108,9 +109,9 @@ volatile uint32_t _cUsers; - size_t (*_RTLogBackdoorPrintf)(const char *pszFormat, ...); - size_t (*_RTLogBackdoorPrintfV)(const char *pszFormat, va_list args); + size_t(*_RTLogBackdoorPrintf)(const char *pszFormat, ...); + size_t(*_RTLogBackdoorPrintfV)(const char *pszFormat, va_list args); int (*_RTLogSetDefaultInstanceThread)(PRTLOGGER pLogger, uintptr_t uKey); int (*_RTMemAllocExTag)(size_t cb, size_t cbAlignment, uint32_t fFlags, const char *pszTag, void **ppv); - void * (*_RTMemContAlloc)(PRTCCPHYS pPhys, size_t cb); + void* (*_RTMemContAlloc)(PRTCCPHYS pPhys, size_t cb); void (*_RTMemContFree)(void *pv, size_t cb); void (*_RTMemFreeEx)(void *pv, size_t cb); @@ -126,6 +127,6 @@ void (*_RTR0AssertPanicSystem)(void); int (*_RTR0Init)(unsigned fReserved); - void * (*_RTR0MemObjAddress)(RTR0MEMOBJ MemObj); - RTR3PTR (*_RTR0MemObjAddressR3)(RTR0MEMOBJ MemObj); + void* (*_RTR0MemObjAddress)(RTR0MEMOBJ MemObj); + RTR3PTR(*_RTR0MemObjAddressR3)(RTR0MEMOBJ MemObj); int (*_RTR0MemObjAllocContTag)(PRTR0MEMOBJ pMemObj, size_t cb, bool fExecutable, const char *pszTag); int (*_RTR0MemObjAllocLowTag)(PRTR0MEMOBJ pMemObj, size_t cb, bool fExecutable, const char *pszTag); @@ -136,32 +137,32 @@ int (*_RTR0MemObjEnterPhysTag)(PRTR0MEMOBJ pMemObj, RTHCPHYS Phys, size_t cb, uint32_t uCachePolicy, const char *pszTag); int (*_RTR0MemObjFree)(RTR0MEMOBJ MemObj, bool fFreeMappings); - RTHCPHYS (*_RTR0MemObjGetPagePhysAddr)(RTR0MEMOBJ MemObj, size_t iPage); + RTHCPHYS(*_RTR0MemObjGetPagePhysAddr)(RTR0MEMOBJ MemObj, size_t iPage); bool (*_RTR0MemObjIsMapping)(RTR0MEMOBJ MemObj); int (*_RTR0MemObjLockKernelTag)(PRTR0MEMOBJ pMemObj, void *pv, size_t cb, uint32_t fAccess, const char *pszTag); int (*_RTR0MemObjLockUserTag)(PRTR0MEMOBJ pMemObj, RTR3PTR R3Ptr, size_t cb, uint32_t fAccess, - RTR0PROCESS R0Process, const char *pszTag); + RTR0PROCESS R0Process, const char *pszTag); int (*_RTR0MemObjMapKernelExTag)(PRTR0MEMOBJ pMemObj, RTR0MEMOBJ MemObjToMap, void *pvFixed, size_t uAlignment, - unsigned fProt, size_t offSub, size_t cbSub, const char *pszTag); + unsigned fProt, size_t offSub, size_t cbSub, const char *pszTag); int (*_RTR0MemObjMapKernelTag)(PRTR0MEMOBJ pMemObj, RTR0MEMOBJ MemObjToMap, void *pvFixed, - size_t uAlignment, unsigned fProt, const char *pszTag); + size_t uAlignment, unsigned fProt, const char *pszTag); int (*_RTR0MemObjMapUserTag)(PRTR0MEMOBJ pMemObj, RTR0MEMOBJ MemObjToMap, RTR3PTR R3PtrFixed, - size_t uAlignment, unsigned fProt, RTR0PROCESS R0Process, const char *pszTag); + size_t uAlignment, unsigned fProt, RTR0PROCESS R0Process, const char *pszTag); int (*_RTR0MemObjProtect)(RTR0MEMOBJ hMemObj, size_t offSub, size_t cbSub, uint32_t fProt); int (*_RTR0MemObjReserveKernelTag)(PRTR0MEMOBJ pMemObj, void *pvFixed, size_t cb, size_t uAlignment, const char *pszTag); int (*_RTR0MemObjReserveUserTag)(PRTR0MEMOBJ pMemObj, RTR3PTR R3PtrFixed, size_t cb, size_t uAlignment, - RTR0PROCESS R0Process, const char *pszTag); - size_t (*_RTR0MemObjSize)(RTR0MEMOBJ MemObj); - RTR0PROCESS (*_RTR0ProcHandleSelf)(void); + RTR0PROCESS R0Process, const char *pszTag); + size_t(*_RTR0MemObjSize)(RTR0MEMOBJ MemObj); + RTR0PROCESS(*_RTR0ProcHandleSelf)(void); void (*_RTR0Term)(void); void (*_RTR0TermForced)(void); - RTPROCESS (*_RTProcSelf)(void); - uint32_t (*_RTSemEventGetResolution)(void); - uint32_t (*_RTSemEventMultiGetResolution)(void); + RTPROCESS(*_RTProcSelf)(void); + uint32_t(*_RTSemEventGetResolution)(void); + uint32_t(*_RTSemEventMultiGetResolution)(void); int (*_RTSemEventMultiWaitEx)(RTSEMEVENTMULTI hEventMultiSem, uint32_t fFlags, uint64_t uTimeout); int (*_RTSemEventMultiWaitExDebug)(RTSEMEVENTMULTI hEventMultiSem, uint32_t fFlags, uint64_t uTimeout, - RTHCUINTPTR uId, RT_SRC_POS_DECL); + RTHCUINTPTR uId, RT_SRC_POS_DECL); int (*_RTSemEventWaitEx)(RTSEMEVENT hEventSem, uint32_t fFlags, uint64_t uTimeout); int (*_RTSemEventWaitExDebug)(RTSEMEVENT hEventSem, uint32_t fFlags, uint64_t uTimeout, - RTHCUINTPTR uId, RT_SRC_POS_DECL); + RTHCUINTPTR uId, RT_SRC_POS_DECL); bool (*_RTThreadIsInInterrupt)(RTTHREAD hThread); void (*_RTThreadPreemptDisable)(PRTTHREADPREEMPTSTATE pState); @@ -171,5 +172,5 @@ bool (*_RTThreadPreemptIsPossible)(void); void (*_RTThreadPreemptRestore)(PRTTHREADPREEMPTSTATE pState); - uint32_t (*_RTTimerGetSystemGranularity)(void); + uint32_t(*_RTTimerGetSystemGranularity)(void); int (*_RTTimerReleaseSystemGranularity)(uint32_t u32Granted); int (*_RTTimerRequestSystemGranularity)(uint32_t u32Request, uint32_t *pu32Granted); @@ -177,14 +178,14 @@ void (*_RTSpinlockRelease)(RTSPINLOCK Spinlock); void (*_RTSpinlockReleaseNoInts)(RTSPINLOCK Spinlock); - void * (*_RTMemTmpAllocTag)(size_t cb, const char *pszTag); + void* (*_RTMemTmpAllocTag)(size_t cb, const char *pszTag); void (*_RTMemTmpFree)(void *pv); - PRTLOGGER (*_RTLogDefaultInstance)(void); - PRTLOGGER (*_RTLogRelDefaultInstance)(void); + PRTLOGGER(*_RTLogDefaultInstance)(void); + PRTLOGGER(*_RTLogRelDefaultInstance)(void); int (*_RTErrConvertToErrno)(int iErr); int (*_VBoxGuestCommonIOCtl)(unsigned iFunction, PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION pSession, - void *pvData, size_t cbData, size_t *pcbDataReturned); + void *pvData, size_t cbData, size_t *pcbDataReturned); int (*_VBoxGuestCreateUserSession)(PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION *ppSession); void (*_VBoxGuestCloseSession)(PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION pSession); - void * (*_VBoxGuestIDCOpen)(uint32_t *pu32Version); + void* (*_VBoxGuestIDCOpen)(uint32_t *pu32Version); int (*_VBoxGuestIDCClose)(void *pvSession); int (*_VBoxGuestIDCCall)(void *pvSession, unsigned iCmd, void *pvData, size_t cbData, size_t *pcbDataReturned); @@ -204,6 +205,6 @@ int (*_RTHeapOffsetInit)(PRTHEAPOFFSET phHeap, void *pvMemory, size_t cbMemory); int (*_RTHeapSimpleInit)(PRTHEAPSIMPLE pHeap, void *pvMemory, size_t cbMemory); - void * (*_RTHeapOffsetAlloc)(RTHEAPOFFSET hHeap, size_t cb, size_t cbAlignment); - void * (*_RTHeapSimpleAlloc)(RTHEAPSIMPLE Heap, size_t cb, size_t cbAlignment); + void* (*_RTHeapOffsetAlloc)(RTHEAPOFFSET hHeap, size_t cb, size_t cbAlignment); + void* (*_RTHeapSimpleAlloc)(RTHEAPSIMPLE Heap, size_t cb, size_t cbAlignment); void (*_RTHeapOffsetFree)(RTHEAPOFFSET hHeap, void *pv); void (*_RTHeapSimpleFree)(RTHEAPSIMPLE Heap, void *pv); Index: /trunk/src/VBox/Additions/haiku/VBoxVideo/driver/driver.cpp =================================================================== --- /trunk/src/VBox/Additions/haiku/VBoxVideo/driver/driver.cpp (revision 43365) +++ /trunk/src/VBox/Additions/haiku/VBoxVideo/driver/driver.cpp (revision 43366) @@ -77,42 +77,42 @@ struct Benaphore { - sem_id sem; - int32 count; - - status_t Init(const char *name) - { - count = 0; - sem = create_sem(0, name); - return sem < 0 ? sem : B_OK; - } - - status_t Acquire() - { - if (atomic_add(&count, 1) > 0) - return acquire_sem(sem); - return B_OK; - } - - status_t Release() - { - if (atomic_add(&count, -1) > 1) - return release_sem(sem); - return B_OK; - } - - void Delete() - { - delete_sem(sem); - } + sem_id sem; + int32 count; + + status_t Init(const char *name) + { + count = 0; + sem = create_sem(0, name); + return sem < 0 ? sem : B_OK; + } + + status_t Acquire() + { + if (atomic_add(&count, 1) > 0) + return acquire_sem(sem); + return B_OK; + } + + status_t Release() + { + if (atomic_add(&count, -1) > 1) + return release_sem(sem); + return B_OK; + } + + void Delete() + { + delete_sem(sem); + } }; struct DeviceInfo { - uint32 openCount; // count of how many times device has been opened - uint32 flags; // device flags - area_id sharedArea; // area shared between driver and all accelerants - SharedInfo *sharedInfo; // pointer to shared info area memory - pci_info pciInfo; // copy of pci info for this device - char name[B_OS_NAME_LENGTH]; // name of device + uint32 openCount; // count of how many times device has been opened + uint32 flags; // device flags + area_id sharedArea; // area shared between driver and all accelerants + SharedInfo *sharedInfo; // pointer to shared info area memory + pci_info pciInfo; // copy of pci info for this device + char name[B_OS_NAME_LENGTH]; // name of device }; Index: /trunk/src/VBox/Runtime/Makefile.kmk =================================================================== --- /trunk/src/VBox/Runtime/Makefile.kmk (revision 43365) +++ /trunk/src/VBox/Runtime/Makefile.kmk (revision 43366) @@ -950,4 +950,61 @@ generic/RTSystemQueryDmiString-generic.cpp +RuntimeR3_SOURCES.haiku = \ + generic/RTDirQueryInfo-generic.cpp \ + generic/RTDirSetTimes-generic.cpp \ + generic/RTFileMove-generic.cpp \ + generic/RTLogWriteDebugger-generic.cpp \ + generic/RTProcDaemonize-generic.cpp \ + generic/RTTimeLocalNow-generic.cpp \ + generic/RTTimerCreate-generic.cpp \ + generic/RTUuidCreate-generic.cpp \ + generic/mppresent-generic.cpp \ + generic/RTSemEventMultiWait-2-ex-generic.cpp \ + generic/RTSemEventMultiWaitNoResume-2-ex-generic.cpp \ + generic/sched-generic.cpp \ + generic/semrw-$(if-expr defined(VBOX_WITH_LOCKLESS_SEMRW),ockless-,)generic.cpp \ + generic/timer-generic.cpp \ + generic/utf16locale-generic.cpp \ + generic/uuid-generic.cpp\ + generic/RTProcIsRunningByName-generic.cpp \ + generic/RTThreadGetNativeState-generic.cpp \ + r3/haiku/rtProcInitExePath-haiku.cpp \ + r3/haiku/time-haiku.cpp \ + r3/posix/RTFileQueryFsSizes-posix.cpp \ + r3/posix/RTHandleGetStandard-posix.cpp \ + r3/posix/RTMemProtect-posix.cpp \ + r3/posix/RTPathUserHome-posix.cpp \ + r3/posix/RTSystemQueryOSInfo-posix.cpp \ + r3/posix/RTSystemQueryTotalRam-posix.cpp \ + r3/posix/RTTimeNow-posix.cpp \ + r3/posix/dir-posix.cpp \ + r3/posix/env-posix.cpp \ + r3/posix/errvars-posix.cpp \ + r3/posix/fileio-posix.cpp \ + r3/posix/fileio2-posix.cpp \ + r3/posix/filelock-posix.cpp \ + r3/posix/fs-posix.cpp \ + r3/posix/fs2-posix.cpp \ + r3/posix/fs3-posix.cpp \ + r3/posix/ldrNative-posix.cpp \ + r3/posix/rtmempage-exec-mmap-heap-posix.cpp \ + r3/posix/path-posix.cpp \ + r3/posix/path2-posix.cpp \ + r3/posix/pathhost-posix.cpp \ + r3/posix/pipe-posix.cpp \ + r3/posix/poll-posix.cpp \ + r3/posix/process-posix.cpp \ + r3/posix/process-creation-posix.cpp \ + r3/posix/rand-posix.cpp \ + r3/posix/semevent-posix.cpp \ + r3/posix/semeventmulti-posix.cpp \ + r3/posix/semmutex-posix.cpp \ + r3/posix/symlink-posix.cpp \ + r3/posix/thread-posix.cpp \ + r3/posix/thread2-posix.cpp \ + r3/posix/timelocal-posix.cpp \ + r3/posix/tls-posix.cpp \ + r3/posix/utf8-posix.cpp + ## PORTME: Porters add their selection of platform specific files for Ring-3 here. @@ -1319,4 +1376,6 @@ iconv \ rt +VBoxRT_LIBS.haiku = \ + iconv VBoxRT_LIBS.solaris = \ kstat \ @@ -1918,4 +1977,35 @@ r0drv/solaris/timer-r0drv-solaris.c +RuntimeR0Drv_SOURCES.haiku = \ + common/misc/thread.cpp \ + common/string/memchr.asm \ + common/string/memmove.asm \ + common/string/strpbrk.cpp \ + common/string/memcmp.asm \ + common/string/strchr.asm \ + generic/RTAssertShouldPanic-generic.cpp \ + generic/RTTimerCreate-generic.cpp \ + generic/mppresent-generic.cpp \ + r0drv/generic/RTMpIsCpuWorkPending-r0drv-generic.cpp \ + r0drv/generic/mpnotification-r0drv-generic.cpp \ + r0drv/haiku/alloc-r0drv-haiku.c \ + r0drv/haiku/assert-r0drv-haiku.c \ + r0drv/haiku/initterm-r0drv-haiku.c \ + r0drv/haiku/memobj-r0drv-haiku.c \ + r0drv/haiku/mp-r0drv-haiku.c \ + r0drv/haiku/process-r0drv-haiku.c \ + r0drv/haiku/RTLogWriteDebugger-r0drv-haiku.c \ + r0drv/haiku/RTLogWriteStdOut-r0drv-haiku.c \ + r0drv/haiku/semevent-r0drv-haiku.c \ + r0drv/haiku/semeventmulti-r0drv-haiku.c \ + r0drv/haiku/semfastmutex-r0drv-haiku.c \ + r0drv/haiku/semmutex-r0drv-haiku.c \ + r0drv/haiku/spinlock-r0drv-haiku.c \ + r0drv/haiku/thread-r0drv-haiku.c \ + r0drv/haiku/thread2-r0drv-haiku.c \ + r0drv/haiku/time-r0drv-haiku.c \ + generic/timer-generic.cpp \ + r0drv/memobj-r0drv.cpp \ + r0drv/powernotification-r0drv.c ## PORTME: Porters create and add their selection of platform specific Ring-0 Driver files here. @@ -2217,8 +2307,10 @@ $(dir) \ $(dir)/darwin \ + $(dir)/haiku \ $(dir)/l4 \ $(dir)/linux \ $(dir)/nt \ $(dir)/os2 \ + $(dir)/solaris \ $(dir)/win \ $(dir)/win32 \ Index: /trunk/src/VBox/Runtime/r0drv/haiku/RTLogWriteDebugger-r0drv-haiku.c =================================================================== --- /trunk/src/VBox/Runtime/r0drv/haiku/RTLogWriteDebugger-r0drv-haiku.c (revision 43365) +++ /trunk/src/VBox/Runtime/r0drv/haiku/RTLogWriteDebugger-r0drv-haiku.c (revision 43366) @@ -36,5 +36,5 @@ RTDECL(void) RTLogWriteDebugger(const char *pch, size_t cb) { - /** @todo implement this */ + /** @todo implement this */ /*kprintf("%.*s", (int)cb, pch);*/ return; Index: /trunk/src/VBox/Runtime/r0drv/haiku/alloc-r0drv-haiku.c =================================================================== --- /trunk/src/VBox/Runtime/r0drv/haiku/alloc-r0drv-haiku.c (revision 43365) +++ /trunk/src/VBox/Runtime/r0drv/haiku/alloc-r0drv-haiku.c (revision 43366) @@ -51,5 +51,5 @@ if (RT_UNLIKELY(!pHdr)) { - LogRel(("rtR0MemAllocEx(%u, %#x) failed\n", (unsigned)cb + sizeof(*pHdr), fFlags)); + LogRel(("rtR0MemAllocEx(%u, %#x) failed\n",(unsigned)cb + sizeof(*pHdr), fFlags)); return VERR_NO_MEMORY; } @@ -90,20 +90,20 @@ void *pv; area_id area = create_area("VirtualBox Contig Alloc", &pv, - B_ANY_KERNEL_ADDRESS, cb, B_32_BIT_CONTIGUOUS, - B_READ_AREA | B_WRITE_AREA); + B_ANY_KERNEL_ADDRESS, cb, B_32_BIT_CONTIGUOUS, + B_READ_AREA | B_WRITE_AREA); if (area >= 0) { - physical_entry physMap[2]; - if (get_memory_map(pv, cb, physMap, 2) >= B_OK) - { - *pPhys = physMap[0].address; + physical_entry physMap[2]; + if (get_memory_map(pv, cb, physMap, 2)>= B_OK) + { + *pPhys = physMap[0].address; return pv; } delete_area(area); - AssertMsgFailed(("Cannot get_memory_map for contig alloc! cb=%u\n", (unsigned)cb)); + AssertMsgFailed(("Cannot get_memory_map for contig alloc! cb=%u\n",(unsigned)cb)); } else - AssertMsgFailed(("Cannot create_area for contig alloc! cb=%u error=0x%08lx\n", (unsigned)cb, area)); + AssertMsgFailed(("Cannot create_area for contig alloc! cb=%u error=0x%08lx\n",(unsigned)cb, area)); return NULL; } @@ -119,7 +119,8 @@ area_id area = area_for(pv); if (area >= B_OK) - delete_area(area); - else - AssertMsgFailed(("Cannot find area to delete! cb=%u error=0x%08lx\n", (unsigned)cb, area)); + delete_area(area); + else + AssertMsgFailed(("Cannot find area to delete! cb=%u error=0x%08lx\n",(unsigned)cb, area)); } } + Index: /trunk/src/VBox/Runtime/r0drv/haiku/initterm-r0drv-haiku.c =================================================================== --- /trunk/src/VBox/Runtime/r0drv/haiku/initterm-r0drv-haiku.c (revision 43365) +++ /trunk/src/VBox/Runtime/r0drv/haiku/initterm-r0drv-haiku.c (revision 43366) @@ -39,5 +39,5 @@ int rtR0InitNative(void) { - return VINF_SUCCESS; + return VINF_SUCCESS; } Index: /trunk/src/VBox/Runtime/r0drv/haiku/memobj-r0drv-haiku.c =================================================================== --- /trunk/src/VBox/Runtime/r0drv/haiku/memobj-r0drv-haiku.c (revision 43365) +++ /trunk/src/VBox/Runtime/r0drv/haiku/memobj-r0drv-haiku.c (revision 43366) @@ -78,16 +78,16 @@ case RTR0MEMOBJTYPE_LOCK: return pMem->u.Lock.R0Process == NIL_RTR0PROCESS - ? kernel_map - : &((struct proc *)pMem->u.Lock.R0Process)->p_vmspace->vm_map; + ? kernel_map + : &((struct proc *)pMem->u.Lock.R0Process)->p_vmspace->vm_map; case RTR0MEMOBJTYPE_RES_VIRT: return pMem->u.ResVirt.R0Process == NIL_RTR0PROCESS - ? kernel_map - : &((struct proc *)pMem->u.ResVirt.R0Process)->p_vmspace->vm_map; + ? kernel_map + : &((struct proc *)pMem->u.ResVirt.R0Process)->p_vmspace->vm_map; case RTR0MEMOBJTYPE_MAPPING: return pMem->u.Mapping.R0Process == NIL_RTR0PROCESS - ? kernel_map - : &((struct proc *)pMem->u.Mapping.R0Process)->p_vmspace->vm_map; + ? kernel_map + : &((struct proc *)pMem->u.Mapping.R0Process)->p_vmspace->vm_map; default: @@ -150,5 +150,5 @@ static int rtR0MemObjNativeAllocArea(PPRTR0MEMOBJINTERNAL ppMem, size_t cb, - bool fExecutable, RTR0MEMOBJTYPE type, RTHCPHYS PhysHighest, size_t uAlignment) + bool fExecutable, RTR0MEMOBJTYPE type, RTHCPHYS PhysHighest, size_t uAlignment) { NOREF(fExecutable); @@ -159,6 +159,6 @@ uint32 addressSpec = B_ANY_KERNEL_ADDRESS; uint32 fLock = ~0U; - LogFlowFunc(("ppMem=%p cb=%u, fExecutable=%s, type=%08x, PhysHighest=%RX64 uAlignment=%u\n", ppMem, (unsigned)cb, - fExecutable ? "true" : "false", type, PhysHighest, (unsigned)uAlignment)); + LogFlowFunc(("ppMem=%p cb=%u, fExecutable=%s, type=%08x, PhysHighest=%RX64 uAlignment=%u\n", ppMem,(unsigned)cb, + fExecutable ? "true" : "false", type, PhysHighest,(unsigned)uAlignment)); switch (type) @@ -194,5 +194,5 @@ case RTR0MEMOBJTYPE_LOCK: break; -#endif +#endif default: return VERR_INTERNAL_ERROR; @@ -237,5 +237,5 @@ } - delete_area(pMemHaiku->AreaId); + delete_area(pMemHaiku->AreaId); } @@ -277,5 +277,5 @@ { AssertReturn(uCachePolicy == RTMEM_CACHE_POLICY_DONT_CARE, VERR_NOT_SUPPORTED); - LogFlowFunc(("ppMem=%p Phys=%08x cb=%u uCachePolicy=%x\n", ppMem, Phys, (unsigned)cb, uCachePolicy)); + LogFlowFunc(("ppMem=%p Phys=%08x cb=%u uCachePolicy=%x\n", ppMem, Phys,(unsigned)cb, uCachePolicy)); /* Create the object. */ @@ -315,5 +315,5 @@ LogFlowFunc(("ppMem=%p pvStart=%p cb=%u fAccess=%x R0Process=%d fFlags=%x\n", ppMem, pvStart, cb, fAccess, R0Process, - fFlags)); + fFlags)); /* Create the object. */ @@ -365,14 +365,14 @@ if (R0Process != NIL_RTR0PROCESS) - team = (team_id)R0Process; + team = (team_id)R0Process; /* Check that the specified alignment is supported. */ if (uAlignment > PAGE_SIZE) - return VERR_NOT_SUPPORTED; + return VERR_NOT_SUPPORTED; /* Create the object. */ PRTR0MEMOBJHAIKU pMemHaiku = (PRTR0MEMOBJHAIKU)rtR0MemObjNew(sizeof(*pMemHaiku), RTR0MEMOBJTYPE_RES_VIRT, NULL, cb); if (!pMemHaiku) - return VERR_NO_MEMORY; + return VERR_NO_MEMORY; /* Ask the kernel to reserve the address range. */ @@ -410,5 +410,5 @@ /** @todo r=ramshankar: Wrong format specifiers, fix later! */ dprintf("%s(%p, %p, %p, %d, %x, %u, %u)\n", __FUNCTION__, ppMem, pMemToMap, pvFixed, uAlignment, - fProt, offSub, cbSub); + fProt, offSub, cbSub); #endif /* Check that the specified alignment is supported. */ @@ -436,5 +436,5 @@ rc = area = clone_area("IPRT R0MemObj MapKernel", &pvMap, uAddrSpec, fProtect, pMemToMapHaiku->AreaId); LogFlow(("rtR0MemObjNativeMapKernel: clone_area uAddrSpec=%d fProtect=%x AreaId=%d rc=%d\n", uAddrSpec, fProtect, - pMemToMapHaiku->AreaId, rc)); + pMemToMapHaiku->AreaId, rc)); } else if (pMemToMapHaiku->Core.enmType == RTR0MEMOBJTYPE_PHYS) @@ -457,5 +457,5 @@ pMemToMapHaiku->Core.cb); if (RT_UNLIKELY(!pMemHaiku)) - return VERR_NO_MEMORY; + return VERR_NO_MEMORY; pMemHaiku->Core.u.Mapping.R0Process = NIL_RTR0PROCESS; @@ -483,5 +483,5 @@ AssertMsgReturn(R3PtrFixed == (RTR3PTR)-1, ("%p\n", R3PtrFixed), VERR_NOT_SUPPORTED); if (uAlignment > PAGE_SIZE) - return VERR_NOT_SUPPORTED; + return VERR_NOT_SUPPORTED; int rc; @@ -493,11 +493,11 @@ vm_prot_t ProtectionFlags = 0; if ((fProt & RTMEM_PROT_NONE) == RTMEM_PROT_NONE) - ProtectionFlags = VM_PROT_NONE; + ProtectionFlags = VM_PROT_NONE; if ((fProt & RTMEM_PROT_READ) == RTMEM_PROT_READ) - ProtectionFlags |= VM_PROT_READ; + ProtectionFlags |= VM_PROT_READ; if ((fProt & RTMEM_PROT_WRITE) == RTMEM_PROT_WRITE) - ProtectionFlags |= VM_PROT_WRITE; + ProtectionFlags |= VM_PROT_WRITE; if ((fProt & RTMEM_PROT_EXEC) == RTMEM_PROT_EXEC) - ProtectionFlags |= VM_PROT_EXECUTE; + ProtectionFlags |= VM_PROT_EXECUTE; /* calc mapping address */ @@ -562,7 +562,7 @@ */ PRTR0MEMOBJHAIKU pMemHaiku = (PRTR0MEMOBJHAIKU)rtR0MemObjNew(sizeof(RTR0MEMOBJHAIKU), - RTR0MEMOBJTYPE_MAPPING, - (void *)AddrR3, - pMemToMap->cb); + RTR0MEMOBJTYPE_MAPPING, + (void *)AddrR3, + pMemToMap->cb); if (pMemHaiku) { @@ -591,8 +591,8 @@ PRTR0MEMOBJHAIKU pMemHaiku = (PRTR0MEMOBJHAIKU)pMem; status_t rc; - + /** @todo r=ramshankar: Validate objects */ - - LogFlow(("rtR0MemObjNativeGetPagePhysAddr: pMem=%p enmType=%x iPage=%u\n", pMem, pMemHaiku->Core.enmType, (unsigned)iPage)); + + LogFlow(("rtR0MemObjNativeGetPagePhysAddr: pMem=%p enmType=%x iPage=%u\n", pMem, pMemHaiku->Core.enmType,(unsigned)iPage)); switch (pMemHaiku->Core.enmType) @@ -602,5 +602,5 @@ team_id TeamId = B_SYSTEM_TEAM; physical_entry aPhysMap[2]; - int32 cPhysMap = 2; /** @todo r=ramshankar: why not use RT_ELEMENTS? */ + int32 cPhysMap = 2; /** @todo r=ramshankar: why not use RT_ELEMENTS? */ if (pMemHaiku->Core.u.Lock.R0Process != NIL_RTR0PROCESS) @@ -643,5 +643,5 @@ team_id TeamId = B_SYSTEM_TEAM; physical_entry aPhysMap[2]; - int32 cPhysMap = 2; /** @todo r=ramshankar: why not use RT_ELEMENTS? */ + int32 cPhysMap = 2; /** @todo r=ramshankar: why not use RT_ELEMENTS? */ void *pb = pMemHaiku->Core.pv + (iPage << PAGE_SHIFT); Index: /trunk/src/VBox/Runtime/r0drv/haiku/semevent-r0drv-haiku.c =================================================================== --- /trunk/src/VBox/Runtime/r0drv/haiku/semevent-r0drv-haiku.c (revision 43365) +++ /trunk/src/VBox/Runtime/r0drv/haiku/semevent-r0drv-haiku.c (revision 43366) @@ -183,5 +183,6 @@ if (fFlags & RTSEMWAIT_FLAGS_INDEFINITE) timeout = B_INFINITE_TIMEOUT; - else { + else + { if (fFlags & RTSEMWAIT_FLAGS_NANOSECS) timeout = uTimeout / 1000; Index: /trunk/src/VBox/Runtime/r0drv/haiku/semfastmutex-r0drv-haiku.c =================================================================== --- /trunk/src/VBox/Runtime/r0drv/haiku/semfastmutex-r0drv-haiku.c (revision 43365) +++ /trunk/src/VBox/Runtime/r0drv/haiku/semfastmutex-r0drv-haiku.c (revision 43366) @@ -63,5 +63,5 @@ PRTSEMFASTMUTEXINTERNAL pThis = (PRTSEMFASTMUTEXINTERNAL)RTMemAllocZ(sizeof(*pThis)); if (RT_UNLIKELY(!pThis)) - return VERR_NO_MEMORY; + return VERR_NO_MEMORY; pThis->u32Magic = RTSEMFASTMUTEX_MAGIC; @@ -74,5 +74,5 @@ } RTMemFree(pThis); - return VERR_TOO_MANY_SEMAPHORES; /** @todo r=ramshankar: use RTErrConvertFromHaikuKernReturn */ + return VERR_TOO_MANY_SEMAPHORES; /** @todo r=ramshankar: use RTErrConvertFromHaikuKernReturn */ } Index: /trunk/src/VBox/Runtime/r0drv/haiku/semmutex-r0drv-haiku.c =================================================================== --- /trunk/src/VBox/Runtime/r0drv/haiku/semmutex-r0drv-haiku.c (revision 43365) +++ /trunk/src/VBox/Runtime/r0drv/haiku/semmutex-r0drv-haiku.c (revision 43366) @@ -83,5 +83,5 @@ } RTMemFree(pThis); - return VERR_TOO_MANY_SEMAPHORES; /** @todo r=ramshankar: use RTErrConvertFromHaikuKernReturn */ + return VERR_TOO_MANY_SEMAPHORES; /** @todo r=ramshankar: use RTErrConvertFromHaikuKernReturn */ } @@ -125,5 +125,5 @@ else { - if (fFlags & RTSEMWAIT_FLAGS_NANOSECS) + if (fFlags & RTSEMWAIT_FLAGS_NANOSECS) timeout = uTimeout / 1000; else if (fFlags & RTSEMWAIT_FLAGS_MILLISECS) Index: /trunk/src/VBox/Runtime/r0drv/haiku/spinlock-r0drv-haiku.c =================================================================== --- /trunk/src/VBox/Runtime/r0drv/haiku/spinlock-r0drv-haiku.c (revision 43365) +++ /trunk/src/VBox/Runtime/r0drv/haiku/spinlock-r0drv-haiku.c (revision 43366) @@ -36,5 +36,5 @@ #include #if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86) -# include +#include #endif #include @@ -142,4 +142,4 @@ if (!(Spinlock->fFlags & RTSPINLOCK_FLAGS_INTERRUPT_SAFE)) RTAssertMsg2("RTSpinlockReleaseNoInts: p=%p (magic=%#x)\n", Spinlock, Spinlock->u32Magic); - RTSpinlockRelease(Spinlock); + RTSpinlockRelease(Spinlock); } Index: /trunk/src/VBox/Runtime/r0drv/haiku/the-haiku-kernel.h =================================================================== --- /trunk/src/VBox/Runtime/r0drv/haiku/the-haiku-kernel.h (revision 43365) +++ /trunk/src/VBox/Runtime/r0drv/haiku/the-haiku-kernel.h (revision 43366) @@ -52,6 +52,6 @@ extern status_t vm_unreserve_address_range(team_id team, void *address, addr_t size); extern status_t vm_reserve_address_range(team_id team, void **_address, uint32 addressSpec, addr_t size, uint32 flags); -extern area_id vm_clone_area(team_id team, const char *name, void **address,uint32 addressSpec, uint32 protection, - uint32 mapping,area_id sourceArea, bool kernel); +extern area_id vm_clone_area(team_id team, const char *name, void **address, uint32 addressSpec, uint32 protection, + uint32 mapping, area_id sourceArea, bool kernel); /* headers/private/kernel/thread_type.h */ @@ -62,27 +62,27 @@ typedef struct { - int32 flags; // summary of events relevant in interrupt - // handlers (signals pending, user debugging - // enabled, etc.) + int32 flags; // summary of events relevant in interrupt + // handlers (signals pending, user debugging + // enabled, etc.) #if 0 - Thread *all_next; - Thread *team_next; - Thread *queue_next; /* i.e. run queue, release queue, etc. */ - timer alarm; - thread_id id; - char name[B_OS_NAME_LENGTH]; - int32 priority; - int32 next_priority; - int32 io_priority; - int32 state; - int32 next_state; + Thread *all_next; + Thread *team_next; + Thread *queue_next; /* i.e. run queue, release queue, etc. */ + timer alarm; + thread_id id; + char name[B_OS_NAME_LENGTH]; + int32 priority; + int32 next_priority; + int32 io_priority; + int32 state; + int32 next_state; #endif - // and a lot more... + // and a lot more... } Thread; /* headers/private/kernel/thread.h */ -extern Thread *thread_get_thread_struct(thread_id id); -extern Thread *thread_get_thread_struct_locked(thread_id id); +extern Thread* thread_get_thread_struct(thread_id id); +extern Thread* thread_get_thread_struct_locked(thread_id id); extern void thread_yield(bool force); @@ -110,5 +110,5 @@ /* Misc stuff from newer kernels. */ #ifndef CALLOUT_FLAG_ABSOLUTE -# define CALLOUT_FLAG_ABSOLUTE 2 +#define CALLOUT_FLAG_ABSOLUTE 2 #endif #endif @@ -126,12 +126,12 @@ { case B_OK: return VINF_SUCCESS; - case B_BAD_SEM_ID: return VERR_SEM_ERROR; - case B_NO_MORE_SEMS: return VERR_TOO_MANY_SEMAPHORES; - case B_BAD_THREAD_ID: return VERR_INVALID_PARAMETER; - case B_NO_MORE_THREADS: return VERR_MAX_THRDS_REACHED; - case B_BAD_TEAM_ID: return VERR_INVALID_PARAMETER; - case B_NO_MORE_TEAMS: return VERR_MAX_PROCS_REACHED; - //default: return VERR_GENERAL_FAILURE; - /** POSIX Errors are defined as a subset of system errors. */ + case B_BAD_SEM_ID: return VERR_SEM_ERROR; + case B_NO_MORE_SEMS: return VERR_TOO_MANY_SEMAPHORES; + case B_BAD_THREAD_ID: return VERR_INVALID_PARAMETER; + case B_NO_MORE_THREADS: return VERR_MAX_THRDS_REACHED; + case B_BAD_TEAM_ID: return VERR_INVALID_PARAMETER; + case B_NO_MORE_TEAMS: return VERR_MAX_PROCS_REACHED; + //default: return VERR_GENERAL_FAILURE; + /** POSIX Errors are defined as a subset of system errors. */ default: return RTErrConvertFromErrno(rc); } @@ -139,2 +139,3 @@ #endif /* ___the_haiku_kernel_h */ + Index: /trunk/src/VBox/Runtime/r0drv/haiku/thread-r0drv-haiku.c =================================================================== --- /trunk/src/VBox/Runtime/r0drv/haiku/thread-r0drv-haiku.c (revision 43365) +++ /trunk/src/VBox/Runtime/r0drv/haiku/thread-r0drv-haiku.c (revision 43366) @@ -34,5 +34,5 @@ #if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86) -# include +#include #endif #include @@ -69,5 +69,5 @@ Assert(hThread == NIL_RTTHREAD); - //XXX: can't do this, it might actually be held by another cpu + //XXX: can't do this, it might actually be held by another cpu //return !B_SPINLOCK_IS_LOCKED(&gThreadSpinlock); return ASMIntAreEnabled(); /** @todo find a better way. */ @@ -78,6 +78,6 @@ { Assert(hThread == NIL_RTTHREAD); - /** @todo check if Thread::next_priority or - * cpu_ent::invoke_scheduler could do. */ + /** @todo check if Thread::next_priority or + * cpu_ent::invoke_scheduler could do. */ return false; } Index: /trunk/src/VBox/Runtime/r0drv/haiku/thread2-r0drv-haiku.c =================================================================== --- /trunk/src/VBox/Runtime/r0drv/haiku/thread2-r0drv-haiku.c (revision 43365) +++ /trunk/src/VBox/Runtime/r0drv/haiku/thread2-r0drv-haiku.c (revision 43366) @@ -34,5 +34,5 @@ #if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86) -# include +#include #endif #include @@ -76,7 +76,7 @@ } - status = set_thread_priority((thread_id)pThread->Core.Key, iPriority); + status = set_thread_priority((thread_id)pThread->Core.Key, iPriority); - return RTErrConvertFromHaikuKernReturn(status); + return RTErrConvertFromHaikuKernReturn(status); } @@ -109,7 +109,7 @@ int rc = rtThreadMain(pThread, (RTNATIVETHREAD)Self, &pThread->szName[0]); - if (rc < 0) - return RTErrConvertFromHaikuKernReturn(rc); - return rc; + if (rc < 0) + return RTErrConvertFromHaikuKernReturn(rc); + return rc; } @@ -117,5 +117,5 @@ int rtThreadNativeCreate(PRTTHREADINT pThreadInt, PRTNATIVETHREAD pNativeThread) { - thread_id NativeThread; + thread_id NativeThread; RT_ASSERT_PREEMPTIBLE(); @@ -123,5 +123,5 @@ if (NativeThread >= B_OK) { - resume_thread(NativeThread); + resume_thread(NativeThread); *pNativeThread = (RTNATIVETHREAD)NativeThread; return VINF_SUCCESS; Index: /trunk/src/VBox/Runtime/r0drv/haiku/time-r0drv-haiku.c =================================================================== --- /trunk/src/VBox/Runtime/r0drv/haiku/time-r0drv-haiku.c (revision 43365) +++ /trunk/src/VBox/Runtime/r0drv/haiku/time-r0drv-haiku.c (revision 43366) @@ -39,5 +39,5 @@ DECLINLINE(uint64_t) rtTimeGetSystemNanoTS(void) { - return system_time() * 1000; + return system_time() * 1000; } @@ -45,5 +45,5 @@ DECLINLINE(uint64_t) rtTimeGetSystemMilliTS(void) { - return system_time() / 1000; + return system_time() / 1000; }