← Back to branch summary

~ubuntu-branches/ubuntu/trusty/virtualbox-ose/trusty

« back to all changes in this revision

Viewing changes to src/VBox/Runtime/generic/timer-generic.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2009-12-18 16:44:29 UTC
  • mfrom: (0.3.3 upstream) (0.4.6 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091218164429-jd34ccexpv5na11a
Tags: 3.1.2-dfsg-1ubuntu1
https://launchpad.net/bugs/498219
https://launchpad.net/bugs/288590
https://launchpad.net/bugs/474625
https://launchpad.net/bugs/495935
https://launchpad.net/bugs/473334
* Merge from Debian unstable (LP: #498219), remaining changes:
  - Disable update action
    - debian/patches/u01-disable-update-action.dpatch
  - VirtualBox should go in Accessories, not in System tools (LP: #288590)
    - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop
  - Add Apport hook
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Add Launchpad integration
    - debian/control
    - debian/lpi-bug.xpm
    - debian/patches/u02-lp-integration.dpatch
* Fixes the following bugs:
  - Kernel module fails to build with Linux >= 2.6.32 (LP: #474625)
  - X.Org drivers need to be rebuilt against X-Server 1.7 (LP: #495935)
  - The *-source packages try to build the kernel modules even though the
    kernel headers aren't available (LP: #473334)
* Replace *-source packages with transitional packages for *-dkms.
* Adapt u01-disable-update-action.dpatch and u02-lp-integration.dpatch for
  new upstream version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Runtime/generic/timer-generic.cpp
33
33
*   Header Files                                                               *
34
34
*******************************************************************************/
35
35
#include <iprt/timer.h>
 
36
#include "internal/iprt.h"
 
37
 
36
38
#include <iprt/thread.h>
37
39
#include <iprt/err.h>
38
40
#include <iprt/assert.h>
133
135
 
134
136
    return rc;
135
137
}
 
138
RT_EXPORT_SYMBOL(RTTimerCreateEx);
136
139
 
137
140
 
138
141
/**
180
183
    RTThreadWait(Thread, 250, NULL);
181
184
    return VINF_SUCCESS;
182
185
}
 
186
RT_EXPORT_SYMBOL(RTTimerDestroy);
183
187
 
184
188
 
185
189
RTDECL(int) RTTimerStart(PRTTIMER pTimer, uint64_t u64First)
203
207
    AssertRC(rc);
204
208
    return rc;
205
209
}
 
210
RT_EXPORT_SYMBOL(RTTimerStart);
206
211
 
207
212
 
208
213
RTDECL(int) RTTimerStop(PRTTIMER pTimer)
222
227
    AssertRC(rc);
223
228
    return rc;
224
229
}
 
230
RT_EXPORT_SYMBOL(RTTimerStop);
225
231
 
226
232
 
227
233
static DECLCALLBACK(int) rtTimerThread(RTTHREAD Thread, void *pvUser)
306
312
{
307
313
    return 10000000; /* 10ms */
308
314
}
 
315
RT_EXPORT_SYMBOL(RTTimerGetSystemGranularity);
309
316
 
310
317
 
311
318
RTDECL(int) RTTimerRequestSystemGranularity(uint32_t u32Request, uint32_t *pu32Granted)
312
319
{
313
320
    return VERR_NOT_SUPPORTED;
314
321
}
 
322
RT_EXPORT_SYMBOL(RTTimerRequestSystemGranularity);
315
323
 
316
324
 
317
325
RTDECL(int) RTTimerReleaseSystemGranularity(uint32_t u32Granted)
318
326
{
319
327
    return VERR_NOT_SUPPORTED;
320
328
}
 
329
RT_EXPORT_SYMBOL(RTTimerReleaseSystemGranularity);
321
330