diff options
author | Chase Douglas <chase.douglas@canonical.com> | 2012-02-07 15:14:05 -0800 |
---|---|---|
committer | Chase Douglas <chase.douglas@canonical.com> | 2012-02-10 13:20:48 -0800 |
commit | c34cf307f9982b62c6e6dfa2687e1b16f527f2a4 (patch) | |
tree | a61132e6032b7e5137a04aaeed94e389dba3bb78 | |
parent | 146edc2baad1388f49a7a857c2003faa171876c7 (diff) |
Introduce SynapticsHwStateAlloc() and SynapticsHwStateFree()
Put them in a new file so eventcomm-test can access them.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r-- | src/Makefile.am | 1 | ||||
-rw-r--r-- | src/synproto.c | 43 | ||||
-rw-r--r-- | src/synproto.h | 6 |
3 files changed, 50 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index a6715e6..5333ba5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -32,6 +32,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include AM_CFLAGS = $(XORG_CFLAGS) @DRIVER_NAME@_drv_la_SOURCES = @DRIVER_NAME@.c synapticsstr.h \ + synproto.c \ synproto.h \ properties.c diff --git a/src/synproto.c b/src/synproto.c new file mode 100644 index 0000000..fc2b157 --- /dev/null +++ b/src/synproto.c @@ -0,0 +1,43 @@ +/* + * Copyright © 2012 Canonical, Ltd. + * + * 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 Red Hat + * not be used in advertising or publicity pertaining to distribution + * of the software without specific, written prior permission. Red + * Hat makes no representations about the suitability of this software + * for any purpose. It is provided "as is" without express or implied + * warranty. + * + * THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN + * NO EVENT SHALL THE AUTHORS 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. + * + * Authors: + * Chase Douglas <chase.douglas@canonical.com> + * + * Trademarks are the property of their respective owners. + */ + + +#include "synproto.h" + +struct SynapticsHwState * +SynapticsHwStateAlloc(SynapticsPrivate *priv) +{ + return calloc(1, sizeof(struct SynapticsHwState)); +} + +void +SynapticsHwStateFree(struct SynapticsHwState **hw) +{ + free(*hw); + *hw = NULL; +} diff --git a/src/synproto.h b/src/synproto.h index 6962bbf..3f09bb2 100644 --- a/src/synproto.h +++ b/src/synproto.h @@ -32,6 +32,9 @@ #include <xf86Xinput.h> #include <xisb.h> +struct _SynapticsPrivateRec; +typedef struct _SynapticsPrivateRec SynapticsPrivate; + /* * A structure to describe the state of the touchpad hardware (buttons and pad) */ @@ -90,4 +93,7 @@ extern struct SynapticsProtocolOperations event_proto_operations; extern struct SynapticsProtocolOperations psm_proto_operations; #endif /* BUILD_PSMCOMM */ +extern struct SynapticsHwState *SynapticsHwStateAlloc(SynapticsPrivate *priv); +extern void SynapticsHwStateFree(struct SynapticsHwState **hw); + #endif /* _SYNPROTO_H_ */ |