sorry, I missed this one. my spamfilter got overly excited over the last week. thanks Ping for forwarding it.
> >From f2ac561863aa95aad03a3975e8c1813391b306e9 Mon Sep 17 00:00:00 2001 > From: Przemo Firszt <[email protected]> > Date: Fri, 13 Nov 2009 17:53:04 +0000 > Subject: [PATCH 1/3] Remove duplicate of #include "xf86Wacom.h" and #include > "wcmFilter.h" > > --- > src/xf86Wacom.c | 12 ++++++------ > 1 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/src/xf86Wacom.c b/src/xf86Wacom.c > index 58ecef0..029da44 100755 > --- a/src/xf86Wacom.c > +++ b/src/xf86Wacom.c > @@ -44,16 +44,13 @@ > */ > > > /****************************************************************************/ > - > -#include "xf86Wacom.h" > -#include "wcmFilter.h" > -#include <sys/stat.h> > -#include <fcntl.h> > - > #ifdef HAVE_CONFIG_H > #include <config.h> > #endif > > +#include <sys/stat.h> > +#include <fcntl.h> > + > #include "xf86Wacom.h" > #include "wcmFilter.h" > > @@ -61,6 +58,9 @@ > #include <xserver-properties.h> > #endif > > +/***************************************************************************** > + * Forward declaration > + > ****************************************************************************/ > void xf86WcmVirtaulTabletPadding(LocalDevicePtr local); > void xf86WcmVirtaulTabletSize(LocalDevicePtr local); > Bool xf86WcmIsWacomDevice (char* fname); > -- > 1.6.5.2 applied, see next comment though. > >From 3e6878ba7288ff71fc2d64d845fd71b91d1545f8 Mon Sep 17 00:00:00 2001 > From: Przemo Firszt <[email protected]> > Date: Fri, 13 Nov 2009 18:24:42 +0000 > Subject: [PATCH 2/3] Add InputDriverRec > > --- > src/xf86Wacom.c | 13 +++++++++++-- > 1 files changed, 11 insertions(+), 2 deletions(-) > > diff --git a/src/xf86Wacom.c b/src/xf86Wacom.c > index 029da44..071b370 100755 > --- a/src/xf86Wacom.c > +++ b/src/xf86Wacom.c > @@ -52,8 +52,7 @@ > #include <fcntl.h> > > #include "xf86Wacom.h" > -#include "wcmFilter.h" > - > + I'm not a big fan of changes like this in an otherwise unrelated patches. the wcmFilter removal seems to fit into the previous patch, doesn't it? i'll squash it in there. > #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 > #include <xserver-properties.h> > #endif > @@ -87,6 +86,16 @@ static Bool xf86WcmDevConvert(LocalDevicePtr local, int > first, int num, > static Bool xf86WcmDevReverseConvert(LocalDevicePtr local, int x, int y, > int* valuators); > > +InputDriverRec WACOM = { > + 1, > + "wacom", > + NULL, > + NULL, > + NULL, > + NULL, > + 0 > +}; > + > WacomModule gWacomModule = > { > NULL, /* input driver pointer */ > -- > 1.6.5.2 we have this struct defined in wcmConfig.c, adding it here would duplicate it. > >From a99805846f3d5e41cda7834a925c9417dfa5c138 Mon Sep 17 00:00:00 2001 > From: Przemo Firszt <[email protected]> > Date: Fri, 13 Nov 2009 18:25:37 +0000 > Subject: [PATCH 3/3] Add XF86ModuleVersionInfo > > --- > src/xf86Wacom.c | 13 +++++++++++++ > 1 files changed, 13 insertions(+), 0 deletions(-) > > diff --git a/src/xf86Wacom.c b/src/xf86Wacom.c > index 071b370..0426f65 100755 > --- a/src/xf86Wacom.c > +++ b/src/xf86Wacom.c > @@ -96,6 +96,19 @@ InputDriverRec WACOM = { > 0 > }; > > +static XF86ModuleVersionInfo VersionRec = { > + "wacom", > + MODULEVENDORSTRING, > + MODINFOSTRING1, > + MODINFOSTRING2, > + XORG_VERSION_CURRENT, > + PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL, > + ABI_CLASS_XINPUT, > + ABI_XINPUT_VERSION, > + MOD_CLASS_XINPUT, > + {0, 0, 0, 0} > +}; > + > WacomModule gWacomModule = > { > NULL, /* input driver pointer */ > -- > 1.6.5.2 same as with the above patch. now, moving these structs and the associated bits over to xf86Wacom.c makes sense in principle, though right now the distinction between what goes into wcmConfig.c and xf86Wacom.c isn't quite clear to me. hence I don't really see the point of moving it around for now until we've sorted out why there's two different files for it :) Cheers, Peter ------------------------------------------------------------------------------ Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now. http://p.sf.net/sfu/bobj-july _______________________________________________ Linuxwacom-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
