← Back to branch summary

~chasedouglas/ubuntu/maverick/xorg-server/multitouch

« back to all changes in this revision

Viewing changes to Xext/sync.c

  • Committer: Bazaar Package Importer
  • Author(s): Julien Cristau, Julien Cristau, Christopher James Halse Rogers
  • Date: 2010-06-07 23:22:48 UTC
  • mfrom: (0.9.4 upstream)
  • mto: This revision was merged to the branch mainline in revision 187.
  • Revision ID: james.westby@ubuntu.com-20100607232248-x9ob0sjy8bwkc2ki
Tags: 2:1.8.1.901-1
[ Julien Cristau ]
* New upstream release
* Merge changes from 2:1.7.7-2.

[ Christopher James Halse Rogers ]
* 16-xaa-fbcomposite-fix-negative-size.diff:
  - mi hunk merged upstream.  Update to keep just the fbpict.c hunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Xext/sync.c
94
94
#define XSyncCAAllTrigger \
95
95
    (XSyncCACounter | XSyncCAValueType | XSyncCAValue | XSyncCATestType)
96
96
 
97
 
static void SyncComputeBracketValues(SyncCounter *, Bool);
 
97
static void SyncComputeBracketValues(SyncCounter *);
98
98
 
99
99
static void SyncInitServerTime(void);
100
100
 
167
167
    }
168
168
 
169
169
    if (IsSystemCounter(pTrigger->pCounter))
170
 
        SyncComputeBracketValues(pTrigger->pCounter, /*startOver*/ TRUE);
 
170
        SyncComputeBracketValues(pTrigger->pCounter);
171
171
}
172
172
 
173
173
 
194
194
    pTrigger->pCounter->pTriglist = pCur;
195
195
 
196
196
    if (IsSystemCounter(pTrigger->pCounter))
197
 
        SyncComputeBracketValues(pTrigger->pCounter, /*startOver*/ TRUE);
 
197
        SyncComputeBracketValues(pTrigger->pCounter);
198
198
 
199
199
    return Success;
200
200
}
351
351
    }
352
352
    else if (IsSystemCounter(pCounter))
353
353
    {
354
 
        SyncComputeBracketValues(pCounter, /*startOver*/ TRUE);
 
354
        SyncComputeBracketValues(pCounter);
355
355
    }
356
356
 
357
357
    return Success;
646
646
 
647
647
    if (IsSystemCounter(pCounter))
648
648
    {
649
 
        SyncComputeBracketValues(pCounter, /* startOver */ FALSE);
 
649
        SyncComputeBracketValues(pCounter);
650
650
    }
651
651
}
652
652
 
913
913
}
914
914
 
915
915
static void
916
 
SyncComputeBracketValues(SyncCounter *pCounter, Bool startOver)
 
916
SyncComputeBracketValues(SyncCounter *pCounter)
917
917
{
918
918
    SyncTriggerList *pCur;
919
919
    SyncTrigger *pTrigger;
930
930
    if (ct == XSyncCounterNeverChanges)
931
931
        return;
932
932
 
933
 
    if (startOver)
934
 
    {
935
 
        XSyncMaxValue(&psci->bracket_greater);
936
 
        XSyncMinValue(&psci->bracket_less);
937
 
    }
 
933
    XSyncMaxValue(&psci->bracket_greater);
 
934
    XSyncMinValue(&psci->bracket_less);
938
935
 
939
936
    for (pCur = pCounter->pTriglist; pCur; pCur = pCur->next)
940
937
    {