rpms/gpm/FC-6 gpm.spec,1.49,1.50 inputattach.c,1.1,1.2
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Apr 2 14:20:02 UTC 2007
Author: tjanouse
Update of /cvs/dist/rpms/gpm/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv18674
Modified Files:
gpm.spec inputattach.c
Log Message:
* Mon Apr 02 2007 Tomas Janousek <tjanouse at redhat.com> - 1.20.1-82
- updated inputattach.c to 1.24 from cvs, fixes #231635
Index: gpm.spec
===================================================================
RCS file: /cvs/dist/rpms/gpm/FC-6/gpm.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- gpm.spec 23 Mar 2007 16:31:10 -0000 1.49
+++ gpm.spec 2 Apr 2007 14:20:00 -0000 1.50
@@ -1,7 +1,7 @@
Summary: A mouse server for the Linux console.
Name: gpm
Version: 1.20.1
-Release: 81%{?dist}
+Release: 82%{?dist}
License: GPL
Group: System Environment/Daemons
Source: http://ftp.linux.it/pub/People/rubini/gpm/%{name}-%{version}.tar.gz
@@ -186,6 +186,9 @@
%{_libdir}/libgpm.so
%changelog
+* Mon Apr 02 2007 Tomas Janousek <tjanouse at redhat.com> - 1.20.1-82
+- updated inputattach.c to 1.24 from cvs, fixes #231635
+
* Fri Mar 23 2007 Tomas Janousek <tjanouse at redhat.com> - 1.20.1-81
- the patch for #168076 caused a strange behaviour with ncurses, fixed it
differently
Index: inputattach.c
===================================================================
RCS file: /cvs/dist/rpms/gpm/FC-6/inputattach.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- inputattach.c 9 Sep 2004 05:52:18 -0000 1.1
+++ inputattach.c 2 Apr 2007 14:20:00 -0000 1.2
@@ -342,6 +342,7 @@
int speed;
int flags;
unsigned long type;
+ unsigned long id;
unsigned long extra;
int flush;
int (*init)(int fd, long *id, long *extra);
@@ -349,30 +350,33 @@
struct input_types input_types[] = {
-{ "--sunkbd", "-skb", B1200, CS8, SERIO_SUNKBD, 0x00, 1, NULL },
-{ "--spaceorb", "-orb", B9600, CS8, SERIO_SPACEORB, 0x00, 1, NULL },
-{ "--spaceball", "-sbl", B9600, CS8, SERIO_SPACEBALL,0x00, 0, spaceball_init },
-{ "--magellan", "-mag", B9600, CS8 | CSTOPB | CRTSCTS, SERIO_MAGELLAN, 0x00, 1, magellan_init },
-{ "--warrior", "-war", B1200, CS7 | CSTOPB, SERIO_WARRIOR, 0x00, 1, warrior_init },
-{ "--stinger", "-sting", B1200, CS8, SERIO_STINGER, 0x00, 1, stinger_init },
-{ "--mousesystems", "-msc", B1200, CS8, SERIO_MSC, 0x01, 1, NULL },
-{ "--sunmouse", "-sun", B1200, CS8, SERIO_SUN, 0x01, 1, NULL },
-{ "--microsoft", "-bare", B1200, CS7, SERIO_MS, 0x00, 1, NULL },
-{ "--mshack", "-ms", B1200, CS7, SERIO_MS, 0x01, 1, NULL },
-{ "--mouseman", "-mman", B1200, CS7, SERIO_MP, 0x01, 1, NULL },
-{ "--intellimouse", "-ms3", B1200, CS7, SERIO_MZ, 0x11, 1, NULL },
-{ "--mmwheel", "-mmw", B1200, CS7 | CSTOPB, SERIO_MZP, 0x13, 1, mzp_init },
-{ "--iforce", "-ifor", B38400, CS8, SERIO_IFORCE, 0x00, 0, NULL },
-{ "--newtonkbd", "-newt", B9600, CS8, SERIO_NEWTON, 0x00, 0, newton_init },
-{ "--h3600ts", "-ipaq", B115200, CS8, SERIO_H3600, 0x00, 0, NULL },
-{ "--stowawaykbd", "-ipaqkbd", B115200, CS8, SERIO_STOWAWAY, 0x00, 0, NULL },
-{ "--ps2serkbd", "-ps2ser", B1200, CS8, SERIO_PS2SER, 0x00, 1, NULL },
-#if 0
-{ "--twiddler", "-twid", B2400, CS8, SERIO_TWIDKBD, 0x00, 0, twiddler_init },
-{ "--twiddler-joy", "-twidjoy", B2400, CS8, SERIO_TWIDJOY, 0x00, 0, twiddler_init },
-{ "--ipod-remote", "-ipod", B9600, CS8, SERIO_IPOD_REM, 0x00, 0, NULL },
-#endif
-{ "--dump", "-dump", B2400, CS8, 0, 0x00, 0, dump_init },
+{ "--sunkbd", "-skb", B1200, CS8, SERIO_SUNKBD, 0, 0, 1, NULL },
+{ "--lkkbd", "-lk", B4800, CS8|CSTOPB, SERIO_LKKBD, 0, 0, 1, NULL },
+{ "--vsxxx-aa", "-vs", B4800, CS8|CSTOPB|PARENB|PARODD,SERIO_VSXXXAA, 0, 0, 1, NULL },
+{ "--spaceorb", "-orb", B9600, CS8, SERIO_SPACEORB, 0, 0, 1, NULL },
+{ "--spaceball", "-sbl", B9600, CS8, SERIO_SPACEBALL,0, 0, 0, spaceball_init },
+{ "--magellan", "-mag", B9600, CS8 | CSTOPB | CRTSCTS, SERIO_MAGELLAN, 0, 0, 1, magellan_init },
+{ "--warrior", "-war", B1200, CS7 | CSTOPB, SERIO_WARRIOR, 0, 0, 1, warrior_init },
+{ "--stinger", "-sting", B1200, CS8, SERIO_STINGER, 0, 0, 1, stinger_init },
+{ "--mousesystems", "-msc", B1200, CS8, SERIO_MSC, 0, 0x01, 1, NULL },
+{ "--sunmouse", "-sun", B1200, CS8, SERIO_SUN, 0, 0x01, 1, NULL },
+{ "--microsoft", "-bare", B1200, CS7, SERIO_MS, 0, 0, 1, NULL },
+{ "--mshack", "-ms", B1200, CS7, SERIO_MS, 0, 0x01, 1, NULL },
+{ "--mouseman", "-mman", B1200, CS7, SERIO_MP, 0, 0x01, 1, NULL },
+{ "--intellimouse", "-ms3", B1200, CS7, SERIO_MZ, 0, 0x11, 1, NULL },
+{ "--mmwheel", "-mmw", B1200, CS7 | CSTOPB, SERIO_MZP, 0, 0x13, 1, mzp_init },
+{ "--iforce", "-ifor", B38400, CS8, SERIO_IFORCE, 0, 0, 0, NULL },
+{ "--newtonkbd", "-newt", B9600, CS8, SERIO_NEWTON, 0, 0, 0, newton_init },
+{ "--h3600ts", "-ipaq", B115200, CS8, SERIO_H3600, 0, 0, 0, NULL },
+{ "--stowawaykbd", "-ipaqkbd", B115200, CS8, SERIO_STOWAWAY, 0, 0, 0, NULL },
+{ "--ps2serkbd", "-ps2ser", B1200, CS8, SERIO_PS2SER, 0, 0, 1, NULL },
+{ "--twiddler", "-twid", B2400, CS8, SERIO_TWIDKBD, 0, 0, 0, twiddler_init },
+{ "--twiddler-joy", "-twidjoy", B2400, CS8, SERIO_TWIDJOY, 0, 0, 0, twiddler_init },
+{ "--elotouch", "-elo", B9600, CS8 | CRTSCTS, SERIO_ELO, 0, 0, 0, NULL },
+{ "--elo4002", "-elo6b", B9600, CS8 | CRTSCTS, SERIO_ELO, 1, 0, 0, NULL },
+{ "--elo271-140", "-elo4b", B9600, CS8 | CRTSCTS, SERIO_ELO, 2, 0, 0, NULL },
+{ "--elo261-280", "-elo3b", B9600, CS8 | CRTSCTS, SERIO_ELO, 3, 0, 0, NULL },
+{ "--dump", "-dump", B2400, CS8, 0, 0, 0, 0, dump_init },
{ "", "", 0, 0 }
};
@@ -392,6 +396,8 @@
puts("");
puts("Modes:");
puts(" --sunkbd -skb Sun Type 4 and Type 5 keyboards");
+ puts(" --lkkbd -lk DEC LK201 / LK401 keyboards");
+ puts(" --vsxxx-aa -vs DEC VSXXX-AA / VSXXX-GA mouse and VSXXX-AB tablet");
puts(" --spaceorb -orb SpaceOrb 360 / SpaceBall Avenger");
puts(" --spaceball -sbl SpaceBall 2003 / 3003 / 4000 FLX");
puts(" --magellan -mag Magellan / SpaceMouse");
@@ -408,11 +414,8 @@
puts(" --h3600ts -ipaq Ipaq h3600 touchscreen");
puts(" --stowawaykbd -ipaqkbd Stowaway keyboard");
puts(" --ps2serkbd -ps2ser PS/2 via serial keyboard");
-#if 0
puts(" --twiddler -twid Handykey Twiddler chording keyboard");
puts(" --twiddler-joy -twidjoy Handykey Twiddler used as a joystick");
- puts(" --ipod-remote -ipod iPod remote control");
-#endif
puts("");
return 1;
}
@@ -438,7 +441,7 @@
if (input_types[type].flush)
while (!readchar(fd, &c, 100));
- id = 0;
+ id = input_types[type].id;
extra = input_types[type].extra;
if (input_types[type].init && input_types[type].init(fd, &id, &extra)) {
@@ -452,7 +455,7 @@
return 1;
}
- devt = SERIO_RS232 | input_types[type].type | (id << 8) | (extra << 16);
+ devt = input_types[type].type | (id << 8) | (extra << 16);
if(ioctl(fd, SPIOCSTYPE, &devt)) {
fprintf(stderr, "inputattach: can't set device type\n");
More information about the fedora-cvs-commits
mailing list