9838b7032e
This is strictly the application of the script 'x-indent-all.sh' from util/modular. Compared to the patch that Daniel posted in January, I've added a few indent flags: -bap -psl -T PrivatePtr -T pmWait -T _XFUNCPROTOBEGIN -T _XFUNCPROTOEND -T _X_EXPORT The typedefs were needed to make the output of sdksyms.sh match the previous output, otherwise, the code is formatted badly enough that sdksyms.sh generates incorrect output. The generated code was compared with the previous version and found to be essentially identical -- "assert" line numbers and BUILD_TIME were the only differences found. The comparison was done with this script: dir1=$1 dir2=$2 for dir in $dir1 $dir2; do (cd $dir && find . -name '*.o' | while read file; do dir=`dirname $file` base=`basename $file .o` dump=$dir/$base.dump objdump -d $file > $dump done) done find $dir1 -name '*.dump' | while read dump; do otherdump=`echo $dump | sed "s;$dir1;$dir2;"` diff -u $dump $otherdump done Signed-off-by: Keith Packard <keithp@keithp.com> Acked-by: Daniel Stone <daniel@fooishbar.org> Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
83 lines
3.1 KiB
C
83 lines
3.1 KiB
C
/*
|
|
* Copyright © 2010 NVIDIA Corporation
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice (including the next
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
* Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
* DEALINGS IN THE SOFTWARE.
|
|
*/
|
|
|
|
#ifdef HAVE_DIX_CONFIG_H
|
|
#include <dix-config.h>
|
|
#endif
|
|
|
|
#ifndef _MISYNCSTR_H_
|
|
#define _MISYNCSTR_H_
|
|
|
|
#include "dix.h"
|
|
#include <X11/extensions/syncconst.h>
|
|
|
|
#define CARD64 XSyncValue /* XXX temporary! need real 64 bit values for Alpha */
|
|
|
|
/* Sync object types */
|
|
#define SYNC_COUNTER 0
|
|
#define SYNC_FENCE 1
|
|
|
|
typedef struct _SyncObject {
|
|
ClientPtr client; /* Owning client. 0 for system counters */
|
|
struct _SyncTriggerList *pTriglist; /* list of triggers */
|
|
XID id; /* resource ID */
|
|
unsigned char type; /* SYNC_* */
|
|
Bool beingDestroyed; /* in process of going away */
|
|
} SyncObject;
|
|
|
|
typedef struct _SyncCounter {
|
|
SyncObject sync; /* Common sync object data */
|
|
CARD64 value; /* counter value */
|
|
struct _SysCounterInfo *pSysCounterInfo; /* NULL if not a system counter */
|
|
} SyncCounter;
|
|
|
|
struct _SyncFence {
|
|
SyncObject sync; /* Common sync object data */
|
|
ScreenPtr pScreen; /* Screen of this fence object */
|
|
SyncFenceFuncsRec funcs; /* Funcs for performing ops on fence */
|
|
Bool triggered; /* fence state */
|
|
PrivateRec *devPrivates; /* driver-specific per-fence data */
|
|
};
|
|
|
|
struct _SyncTrigger {
|
|
SyncObject *pSync;
|
|
CARD64 wait_value; /* wait value */
|
|
unsigned int value_type; /* Absolute or Relative */
|
|
unsigned int test_type; /* transition or Comparision type */
|
|
CARD64 test_value; /* trigger event threshold value */
|
|
Bool (*CheckTrigger) (struct _SyncTrigger * /*pTrigger */ ,
|
|
CARD64 /*newval */
|
|
);
|
|
void (*TriggerFired) (struct _SyncTrigger * /*pTrigger */
|
|
);
|
|
void (*CounterDestroyed) (struct _SyncTrigger * /*pTrigger */
|
|
);
|
|
};
|
|
|
|
typedef struct _SyncTriggerList {
|
|
SyncTrigger *pTrigger;
|
|
struct _SyncTriggerList *next;
|
|
} SyncTriggerList;
|
|
|
|
#endif /* _MISYNCSTR_H_ */
|