← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/ntp/gutsy

« back to all changes in this revision

Viewing changes to ntpd/refclock_conf.c

  • Committer: Bazaar Package Importer
  • Author(s): Steve Kowalik
  • Date: 2007-05-18 22:41:56 UTC
  • mfrom: (1.2.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20070518224156-563ruqxsxvqvoy8h
Tags: 1:4.2.4p0+dfsg-1ubuntu1
* Merge from Debian unstable.
* Remaining Ubuntu changes:
  - Update version in conflicts/replaces to that which was shipped in edgy,
    which was later than that in Debian (due to the ubuntuX).
  - Change default server to ntp.ubuntu.com.
  - Remove stop links from rc0 and rc6
  - Call dh_installinit with --error-handler
  - Set Ubuntu maintainer address.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ntpd/refclock_conf.c
24
24
#define refclock_local  refclock_none
25
25
#endif
26
26
 
27
 
#if defined(CLOCK_TRAK) && defined(PPS)
 
27
#if 0 && defined(CLOCK_TRAK) && defined(PPS)
28
28
extern  struct refclock refclock_trak;
29
29
#else
30
30
#define refclock_trak   refclock_none
96
96
#define refclock_irig   refclock_none
97
97
#endif
98
98
 
99
 
#if defined(CLOCK_MSFEES) && defined(PPS)
 
99
#if 0 && defined(CLOCK_MSFEES) && defined(PPS)
100
100
extern  struct refclock refclock_msfees;
101
101
#else
102
102
#define refclock_msfees refclock_none
267
267
struct refclock *refclock_conf[] = {
268
268
        &refclock_none,         /* 0 REFCLK_NONE */
269
269
        &refclock_local,        /* 1 REFCLK_LOCAL */
270
 
        &refclock_trak,         /* 2 REFCLK_GPS_TRAK */
 
270
        &refclock_none,         /* 2 deprecated: REFCLK_GPS_TRAK */
271
271
        &refclock_pst,          /* 3 REFCLK_WWV_PST */
272
272
        &refclock_wwvb,         /* 4 REFCLK_SPECTRACOM */
273
273
        &refclock_true,         /* 5 REFCLK_TRUETIME */
279
279
        &refclock_arbiter,      /* 11 REFCLK_GPS_ARBITER */
280
280
        &refclock_tpro,         /* 12 REFCLK_IRIG_TPRO */
281
281
        &refclock_leitch,       /* 13 REFCLK_ATOM_LEITCH */
282
 
        &refclock_msfees,       /* 14 REFCLK_MSF_EES */
 
282
        &refclock_none,         /* 14 deprecated: REFCLK_MSF_EES */
283
283
        &refclock_none,         /* 15 not used */
284
284
        &refclock_bancomm,      /* 16 REFCLK_IRIG_BANCOMM */
285
285
        &refclock_datum,        /* 17 REFCLK_GPS_DATUM */