|
ru.linux
- RU.LINUX ---------------------------------------------------------------------
From : Mike Novikoff 2:5020/730.73 30 Sep 2005 15:55:00
To : Zahar Kiselev
Subject : как победить synaptics
--------------------------------------------------------------------------------
ZK> У меня в ноутбуке вместо мыши - touchpad. Когда пробовал грузить
ZK> ядро 2.6 с Gentoo LiveCD - оно опознало его как Synaptics.
Ух, какие фокусы. Он, оказывается, существует в природе! 8-)
"Всё-таки она вертится!" :-)
А вот у меня фокусы - совсем другие:
>=== gpm-1.20.1-mn-no_synaptics.patch ===<
# This patch removes the support for "Synaptics TouchPad" devices. I never
# had any of these, don't even know what they are. The source "synaptics.c"
# [110K] is the _largest_ in "src/" dir, enough to be considered bloatware.
# BUT THE WORST is that it uses ceil() from <math.h> (didn't in gpm-1.19.3),
# which forces the whole libgpm.so to be linked against libm (math library).
# And then EVERY PROGRAM THAT USES GPM opens libm.so, too! (lsof). Now what
# about the future rpm deps? (Hadn't tested for real, but ldd shows...).
# -- mn@lo, 20.03.2005
#
diff -ru gpm-1.20.1-vanilla/doc/doc.gpm.in gpm-1.20.1-patched/doc/doc.gpm.in
--- gpm-1.20.1-vanilla/doc/doc.gpm.in 2002-12-25 01:57:16.000000000 +0300
+++ gpm-1.20.1-patched/doc/doc.gpm.in 2005-03-20 00:00:00.000000000 +0300
@@ -759,11 +759,23 @@
distribution.
@item syn synaptics
+%
+% mn@lo: The first line is for texinfo (note '@@' escaped),
+% second is for man (with '.I'talic font, man 7 man).
+%
+%MSKIP
+ [*** DISABLED BY mn@@lo, 20.03.2005 ***].
+%M .I
+%M [*** DISABLED BY mn@lo, 20.03.2005 ***].
A decoder for the Synaptics TouchPad connected to the serial port.
This mouse decoder accepts standard serial options, although
they should not be needed.
@item synps2 synaptics_ps2
+%MSKIP
+ [*** DISABLED BY mn@@lo, 20.03.2005 ***].
+%M .I
+%M [*** DISABLED BY mn@lo, 20.03.2005 ***].
Same as above, but for the devices attached to the ps2 port.
@item brw
diff -ru gpm-1.20.1-vanilla/src/Makefile.in gpm-1.20.1-patched/src/Makefile.in
--- gpm-1.20.1-vanilla/src/Makefile.in 2002-12-25 01:57:16.000000000 +0300
+++ gpm-1.20.1-patched/src/Makefile.in 2005-03-20 00:00:00.000000000 +0300
@@ -13,7 +13,7 @@
# Main portion: regular build rules
-GSRC = main.c gpm.c gpn.c mice.c special.c twiddler.c synaptics.c \
+GSRC = main.c gpm.c gpn.c mice.c special.c twiddler.c \
startup.c server_tools.c
GOBJ = $(GSRC:.c=.o) report.o tools.o
@@ -24,7 +24,7 @@
PICS = $(LOBJ:.o=.lo)
-HDRS = gpm.h gpmInt.h twiddler.h synaptics.h message.h
+HDRS = gpm.h gpmInt.h twiddler.h message.h
PSRC = prog/mev.c prog/hltest.c prog/mouse-test.c prog/disable-paste.c
@@ -143,7 +143,7 @@
$(CC) -I. @CPPFLAGS@ $(CPPFLAGS) @CFLAGS@ $(CFLAGS) -c -o $@.o $<
$(CC) @LDFLAGS@ $(LDFLAGS) -o $@ $@.o @LIBS@ $(LIBS) lib/libgpm.a
-prog/mouse-test: mice.o twiddler.o synaptics.o
+prog/mouse-test: mice.o twiddler.o
$(PROG): lib/libgpm.so lib/@SHLIB@ lib/libgpm.a
diff -ru gpm-1.20.1-vanilla/src/mice.c gpm-1.20.1-patched/src/mice.c
--- gpm-1.20.1-vanilla/src/mice.c 2002-12-25 01:57:16.000000000 +0300
+++ gpm-1.20.1-patched/src/mice.c 2005-03-20 00:00:00.000000000 +0300
@@ -73,7 +73,6 @@
#include "headers/gpmInt.h"
#include "headers/twiddler.h"
-#include "headers/synaptics.h"
#include "headers/message.h"
/*========================================================================*/
@@ -1192,20 +1191,6 @@
}
#endif /* have joystick.h */
-/* Synaptics TouchPad mouse emulation (Henry Davies) */
-static int M_synaptics_serial(Gpm_Event *state, unsigned char *data)
-{
- syn_process_serial_data (state, data);
- return 0;
-}
-
-
-/* Synaptics TouchPad mouse emulation (Henry Davies) */
-static int M_synaptics_ps2(Gpm_Event *state, unsigned char *data)
-{
- syn_process_ps2_data(state, data);
- return 0;
-}
static int M_mtouch(Gpm_Event *state, unsigned char *data)
{
@@ -1592,17 +1577,6 @@
write(fd, "@" ,1); /* setup tablet. relative mode, resolution... */
}
- if (type->fun==M_synaptics_serial) {
- int packet_length;
-
- setspeed (fd, 1200, 1200, 1, flags);
- packet_length = syn_serial_init (fd);
- setspeed (fd, 1200, 9600, 1, flags);
-
- type->packetlen = packet_length;
- type->howmany = packet_length;
- }
-
if (type->fun==M_vsxxx_aa) {
setspeed (fd, 4800, 4800, 0, flags); /* no write */
write(fd, "R", 1); /* initialize a mouse; without getting an "R" */
@@ -1942,14 +1916,6 @@
return I_serial(fd, flags, type, argc, argv);
}
-/* synaptics touchpad, ps2 version: Henry Davies */
-static Gpm_Type *I_synps2(int fd, unsigned short flags,
- struct Gpm_Type *type, int argc, char **argv)
-{
- syn_ps2_init (fd);
- return type;
-}
-
static Gpm_Type *I_summa(int fd, unsigned short flags,
struct Gpm_Type *type, int argc, char **argv)
@@ -2303,12 +2269,6 @@
{"summa", "Summagraphics or Genius tablet absolute mode(MM-Series)",
"", M_summa, I_summa, STD_FLG,
{0x80, 0x80, 0x00, 0x00}, 5, 1, 0, 1,
R_summa},
- {"syn", "The \"Synaptics\" serial TouchPad.",
- "synaptics", M_synaptics_serial, I_serial, CS7 | STD_FLG,
- {0x40, 0x40, 0x40, 0x00}, 6, 6, 1, 0, 0},
- {"synps2", "The \"Synaptics\" PS/2 TouchPad",
- "synaptics_ps2", M_synaptics_ps2, I_synps2, STD_FLG,
- {0x80, 0x80, 0x00, 0x00}, 6, 1, 1, 0, 0},
{"twid", "Twidddler keyboard",
"", M_twid, I_twid, CS8 | STD_FLG,
{0x80, 0x00, 0x80, 0x80}, 5, 1, 0, 0, 0},
>=== gpm-1.20.1-mn-no_synaptics.patch ===<
P.S. /usr/bin/patch --ignore-whitespace
"...because tabs are technically not allowed in FidoNet technology messages"
-- golded+-1.1.4.7/gold_ref.txt
Mike
---
* Origin: mn@lo.lan (2:5020/730.73)
Вернуться к списку тем, сортированных по: возрастание даты уменьшение даты тема автор
|
