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>
87 lines
2.6 KiB
C
87 lines
2.6 KiB
C
/*
|
|
* Copyright 2006 Luc Verhaegen.
|
|
*
|
|
* 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, sub license,
|
|
* 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 NON-INFRINGEMENT. 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_XORG_CONFIG_H
|
|
#include <xorg-config.h>
|
|
#endif
|
|
|
|
#include "xf86.h"
|
|
#include "xf86DDC.h"
|
|
#include <X11/Xatom.h>
|
|
#include "property.h"
|
|
#include "propertyst.h"
|
|
#include <string.h>
|
|
|
|
#define EDID1_ATOM_NAME "XFree86_DDC_EDID1_RAWDATA"
|
|
|
|
static void
|
|
edidMakeAtom(int i, const char *name, CARD8 *data, int size)
|
|
{
|
|
Atom atom;
|
|
unsigned char *atom_data;
|
|
|
|
if (!(atom_data = malloc(size * sizeof(CARD8))))
|
|
return;
|
|
|
|
atom = MakeAtom(name, strlen(name), TRUE);
|
|
memcpy(atom_data, data, size);
|
|
xf86RegisterRootWindowProperty(i, atom, XA_INTEGER, 8, size, atom_data);
|
|
}
|
|
|
|
static void
|
|
addRootWindowProperties(ScrnInfoPtr pScrn, xf86MonPtr DDC)
|
|
{
|
|
int scrnIndex = pScrn->scrnIndex;
|
|
|
|
if (DDC->flags & MONITOR_DISPLAYID) {
|
|
/* Don't bother, use RANDR already */
|
|
return;
|
|
}
|
|
else if (DDC->ver.version == 1) {
|
|
int size = 128 +
|
|
(DDC->flags & EDID_COMPLETE_RAWDATA ? DDC->no_sections * 128 : 0);
|
|
|
|
edidMakeAtom(scrnIndex, EDID1_ATOM_NAME, DDC->rawData, size);
|
|
}
|
|
else {
|
|
xf86DrvMsg(scrnIndex, X_PROBED, "unexpected EDID version %d.%d\n",
|
|
DDC->ver.version, DDC->ver.revision);
|
|
return;
|
|
}
|
|
}
|
|
|
|
Bool
|
|
xf86SetDDCproperties(ScrnInfoPtr pScrn, xf86MonPtr DDC)
|
|
{
|
|
if (!pScrn || !pScrn->monitor || !DDC)
|
|
return FALSE;
|
|
|
|
if (DDC->flags & MONITOR_DISPLAYID);
|
|
else
|
|
xf86EdidMonitorSet(pScrn->scrnIndex, pScrn->monitor, DDC);
|
|
|
|
addRootWindowProperties(pScrn, DDC);
|
|
|
|
return TRUE;
|
|
}
|