← Back to branch summary

~n-muench/ubuntu/precise/open-vm-tools/open-vm-tools-precise.sid-merge1

« back to all changes in this revision

Viewing changes to services/plugins/timeSync/timeSync.h

  • Committer: Bazaar Package Importer
  • Author(s): Serge Hallyn
  • Date: 2011-03-31 14:20:05 UTC
  • mfrom: (1.4.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20110331142005-3n9red91p7ogkweo
Tags: 2011.03.28-387002-0ubuntu1
https://launchpad.net/bugs/727342
https://launchpad.net/bugs/332323
https://launchpad.net/bugs/332323
* Merge latest upstream git tag.  This has the unlocked_ioctl change
  needed to fix dkms build failures (LP: #727342)
* Changes in debian/rules:
  - work around a bug in toolbox/Makefile, where install-exec-hook is
    not happening.  This needs to get fixed the right way.
  - don't install 'vmware-user' which seems to no longer exist
  - move /etc/xdg into open-vm-toolbox (which should be done using .install)
* debian/open-vm-tools.init: add 'modprobe [-r] vmblock'. (LP: #332323)
* debian/rules and debian/open-vm-toolbox.lintian-overrides:
  - Make vmware-user-suid-wrapper suid-root (LP: #332323)

Show diffs side-by-side

added added

removed removed

Lines of Context:
services/plugins/timeSync/timeSync.h
37
37
TimeSync_AddToCurrentTime(int64 delta);
38
38
 
39
39
Bool
40
 
TimeSync_EnableTimeSlew(int64 delta,
41
 
                        int64 timeSyncPeriod);
 
40
TimeSync_Slew(int64 delta,
 
41
              int64 timeSyncPeriod,
 
42
              int64 *remaining);
42
43
 
43
44
Bool
44
45
TimeSync_DisableTimeSlew(void);
45
46
 
 
47
Bool
 
48
TimeSync_PLLUpdate(int64 offset);
 
49
 
 
50
Bool
 
51
TimeSync_PLLSetFrequency(int64 ppmCorrection);
 
52
 
 
53
Bool
 
54
TimeSync_PLLSupported(void);
 
55
 
46
56
#endif /* _TIMESYNC_INT_H_ */
47
57