On Sun, Feb 27, 2011 at 01:11:47AM +0500, Alexandr Shadchin wrote:
> Signed-off-by: Alexandr Shadchin <[email protected]>
> ---
> src/ps2comm.c | 7 -------
> src/ps2comm.h | 8 ++++++--
> src/psmcomm.c | 7 -------
> src/synproto.h | 1 -
> 4 files changed, 6 insertions(+), 17 deletions(-)
>
> diff --git a/src/ps2comm.c b/src/ps2comm.c
> index a34613e..1ea09c9 100644
> --- a/src/ps2comm.c
> +++ b/src/ps2comm.c
> @@ -82,13 +82,6 @@
> #define PS2DBG(x)
> #endif
>
> -struct SynapticsHwInfo {
> - unsigned int model_id; /* Model-ID */
> - unsigned int capabilities; /* Capabilities */
> - unsigned int ext_cap; /* Extended Capabilities */
> - unsigned int identity; /* Identification */
> -};
can we give this some ps2-related name in a follow-up patch?
Cheers,
Peter
> -
>
> /*****************************************************************************
> * PS/2 Utility functions.
> * Many parts adapted from tpconfig.c by C. Scott Ananian
> diff --git a/src/ps2comm.h b/src/ps2comm.h
> index fec5634..99ff3ec 100644
> --- a/src/ps2comm.h
> +++ b/src/ps2comm.h
> @@ -94,10 +94,14 @@
>
> typedef unsigned char byte;
>
> +struct SynapticsHwInfo {
> + unsigned int model_id; /* Model-ID */
> + unsigned int capabilities; /* Capabilities */
> + unsigned int ext_cap; /* Extended Capabilities */
> + unsigned int identity; /* Identification */
> +};
>
> Bool ps2_putbyte(int fd, byte b);
> -
> -struct SynapticsHwInfo;
> void ps2_print_ident(const struct SynapticsHwInfo *synhw);
>
> #endif /* _PS2COMM_H_ */
> diff --git a/src/psmcomm.c b/src/psmcomm.c
> index 903e6dd..88263ae 100644
> --- a/src/psmcomm.c
> +++ b/src/psmcomm.c
> @@ -52,13 +52,6 @@
>
> #define SYSCALL(call) while (((call) == -1) && (errno == EINTR))
>
> -struct SynapticsHwInfo {
> - unsigned int model_id; /* Model-ID */
> - unsigned int capabilities; /* Capabilities */
> - unsigned int ext_cap; /* Extended Capabilities */
> - unsigned int identity; /* Identification */
> -};
> -
> /*
> * Identify Touchpad
> * See also the SYN_ID_* macros
> diff --git a/src/synproto.h b/src/synproto.h
> index 96ddf3e..a899a73 100644
> --- a/src/synproto.h
> +++ b/src/synproto.h
> @@ -79,7 +79,6 @@ enum SynapticsProtocol {
> };
>
> struct _SynapticsParameters;
> -struct SynapticsHwInfo;
> struct CommData;
>
> struct SynapticsProtocolOperations {
> --
> 1.7.3.5
>
_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
