From 3744281b9ae8aa0ab86ceaee1afe8a603e3aeb2c Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 19 Nov 2012 10:16:38 +0100 Subject: dos -> unix --- xorg-server/hw/dmx/input/Makefile.am | 134 +++++++++++++++++------------------ xorg-server/hw/dmx/input/dmxdummy.h | 86 +++++++++++----------- 2 files changed, 110 insertions(+), 110 deletions(-) (limited to 'xorg-server/hw/dmx/input') diff --git a/xorg-server/hw/dmx/input/Makefile.am b/xorg-server/hw/dmx/input/Makefile.am index ebe9a0843..185aaf84e 100644 --- a/xorg-server/hw/dmx/input/Makefile.am +++ b/xorg-server/hw/dmx/input/Makefile.am @@ -1,67 +1,67 @@ -noinst_LIBRARIES = libdmxinput.a - -if DMX_BUILD_LNX -RAWSRCS = lnx-keyboard.c \ - lnx-keyboard.h \ - lnx-ms.c \ - lnx-ms.h \ - lnx-ps2.c \ - lnx-ps2.h -endif - -if DMX_BUILD_USB -USBSRCS = usb-keyboard.c \ - usb-keyboard.h \ - usb-mouse.c \ - usb-mouse.h \ - usb-other.c \ - usb-other.h \ - usb-common.c \ - usb-common.h \ - usb-private.h -endif - -DRVSRCS = dmxdummy.c \ - dmxdummy.h \ - dmxbackend.c \ - dmxbackend.h \ - dmxconsole.c \ - dmxconsole.h \ - dmxcommon.c \ - dmxcommon.h - -DMXSRCS = dmxinputinit.c \ - dmxinputinit.h \ - dmxarg.c \ - dmxarg.h \ - dmxsigio.c \ - dmxsigio.h \ - dmxevents.c \ - dmxevents.h \ - dmxxinput.c \ - dmxmotion.c \ - dmxmotion.h \ - dmxmap.c \ - dmxmap.h - - -libdmxinput_a_SOURCES = ChkNotMaskEv.c \ - ChkNotMaskEv.h \ - atKeynames.h \ - $(RAWSRCS) \ - $(USBSRCS) \ - $(DRVSRCS) \ - $(DMXSRCS) \ - $(LIBSRCS) - -if GLX -GLX_DEFS = @GL_CFLAGS@ -endif - -AM_CFLAGS = $(DIX_CFLAGS) \ - -I$(top_srcdir)/hw/dmx \ - -DHAVE_DMX_CONFIG_H \ - $(GLX_DEFS) \ - @DMXMODULES_CFLAGS@ - -EXTRA_DIST = dmxdetach.c +noinst_LIBRARIES = libdmxinput.a + +if DMX_BUILD_LNX +RAWSRCS = lnx-keyboard.c \ + lnx-keyboard.h \ + lnx-ms.c \ + lnx-ms.h \ + lnx-ps2.c \ + lnx-ps2.h +endif + +if DMX_BUILD_USB +USBSRCS = usb-keyboard.c \ + usb-keyboard.h \ + usb-mouse.c \ + usb-mouse.h \ + usb-other.c \ + usb-other.h \ + usb-common.c \ + usb-common.h \ + usb-private.h +endif + +DRVSRCS = dmxdummy.c \ + dmxdummy.h \ + dmxbackend.c \ + dmxbackend.h \ + dmxconsole.c \ + dmxconsole.h \ + dmxcommon.c \ + dmxcommon.h + +DMXSRCS = dmxinputinit.c \ + dmxinputinit.h \ + dmxarg.c \ + dmxarg.h \ + dmxsigio.c \ + dmxsigio.h \ + dmxevents.c \ + dmxevents.h \ + dmxxinput.c \ + dmxmotion.c \ + dmxmotion.h \ + dmxmap.c \ + dmxmap.h + + +libdmxinput_a_SOURCES = ChkNotMaskEv.c \ + ChkNotMaskEv.h \ + atKeynames.h \ + $(RAWSRCS) \ + $(USBSRCS) \ + $(DRVSRCS) \ + $(DMXSRCS) \ + $(LIBSRCS) + +if GLX +GLX_DEFS = @GL_CFLAGS@ +endif + +AM_CFLAGS = $(DIX_CFLAGS) \ + -I$(top_srcdir)/hw/dmx \ + -DHAVE_DMX_CONFIG_H \ + $(GLX_DEFS) \ + @DMXMODULES_CFLAGS@ + +EXTRA_DIST = dmxdetach.c diff --git a/xorg-server/hw/dmx/input/dmxdummy.h b/xorg-server/hw/dmx/input/dmxdummy.h index 17318b4d9..e3a85be95 100644 --- a/xorg-server/hw/dmx/input/dmxdummy.h +++ b/xorg-server/hw/dmx/input/dmxdummy.h @@ -1,43 +1,43 @@ -/* - * Copyright 2002 Red Hat Inc., Durham, North Carolina. - * - * All Rights Reserved. - * - * 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 on 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 - * NON-INFRINGEMENT. IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS - * 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. - */ - -/* - * Authors: - * Rickard E. (Rik) Faith - * - */ - -/** \file - * Interface to dummy input device support. \see dmxdummy.c */ - -#ifndef _DMXDUMMY_H_ -#define _DMXDUMMY_H_ - -extern void dmxDummyMouGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info); -extern void dmxDummyKbdGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info); - -#endif +/* + * Copyright 2002 Red Hat Inc., Durham, North Carolina. + * + * All Rights Reserved. + * + * 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 on 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 + * NON-INFRINGEMENT. IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS + * 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. + */ + +/* + * Authors: + * Rickard E. (Rik) Faith + * + */ + +/** \file + * Interface to dummy input device support. \see dmxdummy.c */ + +#ifndef _DMXDUMMY_H_ +#define _DMXDUMMY_H_ + +extern void dmxDummyMouGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info); +extern void dmxDummyKbdGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info); + +#endif -- cgit v1.2.3