On Thu, Mar 03, 2011 at 05:37:16PM -0800, Ping Cheng wrote: > Shouldn't we merge 8/11 to this one?
yeah, fair call. I'll squash them together. Cheers, Peter > On Thu, Mar 3, 2011 at 4:56 PM, Peter Hutterer > <[email protected]>wrote: > > > And rename tooldef to tooldefault, I always get confused by that. > > > > Signed-off-by: Peter Hutterer <[email protected]> > > --- > > src/wcmCommon.c | 16 ++++++++++++---- > > 1 files changed, 12 insertions(+), 4 deletions(-) > > > > diff --git a/src/wcmCommon.c b/src/wcmCommon.c > > index bf33507..7f420ef 100644 > > --- a/src/wcmCommon.c > > +++ b/src/wcmCommon.c > > @@ -1011,11 +1011,19 @@ static int findDeviceType(const WacomCommonPtr > > common, > > return device_type; > > } > > > > -/* Find the device the current events are meant for */ > > +/** > > + * Find the device the current events are meant for. If multiple tools are > > + * configured on this device, the one that matches the serial number for > > the > > + * current device state is returned. If none match, the tool that has a > > + * serial of 0 is returned. > > + * > > + * @param ds The current device state as read from the fd > > + * @return The tool that should be used to emit the current events. > > + */ > > static WacomToolPtr findTool(const WacomCommonPtr common, > > const WacomDeviceState *ds) > > { > > - WacomToolPtr tooldef = NULL; > > + WacomToolPtr tooldefault = NULL; > > WacomToolPtr tool = NULL; > > > > /* 1: Find the tool (the one with correct serial or in second > > @@ -1028,7 +1036,7 @@ static WacomToolPtr findTool(const WacomCommonPtr > > common, > > if (tool->serial == ds->serial_num) > > break; > > else if (!tool->serial) > > - tooldef = tool; > > + tooldefault = tool; > > } > > } > > > > @@ -1038,7 +1046,7 @@ static WacomToolPtr findTool(const WacomCommonPtr > > common, > > > > /* Use default tool (serial == 0) if no specific was found */ > > if (!tool) > > - tool = tooldef; > > + tool = tooldefault; > > > > return tool; > > } > > -- > > 1.7.4 > > ------------------------------------------------------------------------------ What You Don't Know About Data Connectivity CAN Hurt You This paper provides an overview of data connectivity, details its effect on application quality, and explores various alternative solutions. http://p.sf.net/sfu/progress-d2d _______________________________________________ Linuxwacom-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
