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>
89 lines
2.3 KiB
C
89 lines
2.3 KiB
C
/*
|
|
* Copyright 1997,1998 by UCHIYAMA Yasushi
|
|
*
|
|
* Permission to use, copy, modify, distribute, and sell this software and its
|
|
* documentation for any purpose is hereby granted without fee, provided that
|
|
* the above copyright notice appear in all copies and that both that
|
|
* copyright notice and this permission notice appear in supporting
|
|
* documentation, and that the name of UCHIYAMA Yasushi not be used in
|
|
* advertising or publicity pertaining to distribution of the software without
|
|
* specific, written prior permission. UCHIYAMA Yasushi makes no representations
|
|
* about the suitability of this software for any purpose. It is provided
|
|
* "as is" without express or implied warranty.
|
|
*
|
|
* UCHIYAMA YASUSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
|
|
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
|
|
* EVENT SHALL UCHIYAMA YASUSHI BE LIABLE FOR ANY SPECIAL, INDIRECT OR
|
|
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
|
|
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
|
|
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
|
* PERFORMANCE OF THIS SOFTWARE.
|
|
*
|
|
*/
|
|
|
|
#ifdef HAVE_XORG_CONFIG_H
|
|
#include <xorg-config.h>
|
|
#endif
|
|
|
|
#include <X11/X.h>
|
|
|
|
#include "input.h"
|
|
#include "scrnintstr.h"
|
|
|
|
#include "compiler.h"
|
|
|
|
#include "xf86.h"
|
|
#include "xf86Priv.h"
|
|
#include "xf86_OSlib.h"
|
|
|
|
#include <stdio.h>
|
|
#include <errno.h>
|
|
#include <sys/time.h>
|
|
#include <sys/file.h>
|
|
#include <assert.h>
|
|
#include <mach.h>
|
|
|
|
int
|
|
xf86ProcessArgument(int argc, char **argv, int i)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
void
|
|
xf86UseMsg()
|
|
{
|
|
return;
|
|
}
|
|
|
|
void
|
|
xf86OpenConsole()
|
|
{
|
|
if (serverGeneration == 1) {
|
|
kern_return_t err;
|
|
mach_port_t device;
|
|
int fd;
|
|
|
|
err = get_privileged_ports(NULL, &device);
|
|
if (err) {
|
|
errno = err;
|
|
FatalError("xf86KbdInit can't get_privileged_ports. (%s)\n",
|
|
strerror(errno));
|
|
}
|
|
mach_port_deallocate(mach_task_self(), device);
|
|
|
|
if ((fd = open("/dev/kbd", O_RDONLY | O_NONBLOCK)) < 0) {
|
|
fprintf(stderr, "Cannot open keyboard (%s)\n", strerror(errno));
|
|
exit(1);
|
|
}
|
|
xf86Info.consoleFd = fd;
|
|
}
|
|
return;
|
|
}
|
|
|
|
void
|
|
xf86CloseConsole()
|
|
{
|
|
close(xf86Info.consoleFd);
|
|
return;
|
|
}
|