linuxconsole-commit Mailing List for Linux Console Project

Brought to you by: esr, jsimmons, skitt, vojtech

linuxconsole-commit — CVS commit mailing list

You can subscribe to this list here.

2001	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (135)	Nov (123)	Dec (83)
2002	Jan (244)	Feb (72)	Mar (221)	Apr (91)	May (104)	Jun (93)	Jul (78)	Aug (1)	Sep (1)	Oct (29)	Nov (98)	Dec (20)
2003	Jan	Feb (21)	Mar	Apr (1)	May	Jun	Jul	Aug (18)	Sep (18)	Oct (23)	Nov (12)	Dec (6)
2004	Jan (2)	Feb (32)	Mar	Apr (12)	May (11)	Jun (11)	Jul	Aug (9)	Sep	Oct (15)	Nov	Dec
2005	Jan	Feb (2)	Mar (11)	Apr (6)	May (1)	Jun (9)	Jul (7)	Aug	Sep	Oct	Nov	Dec (1)
2006	Jan	Feb (1)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2007	Jan	Feb (2)	Mar	Apr (25)	May (2)	Jun	Jul (5)	Aug	Sep	Oct	Nov	Dec
2008	Jan	Feb	Mar (1)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2009	Jan	Feb (1)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2010	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (13)	Oct	Nov (2)	Dec (2)
2011	Jan	Feb	Mar (10)	Apr (10)	May (1)	Jun (6)	Jul	Aug (2)	Sep (5)	Oct	Nov	Dec

Flat | Threaded

1 2 3 .. 69 > >> (Page 1 of 69)

[Linuxconsole-commit] SF.net SVN: linuxconsole:[2435] trunk

From: <sk...@us...> - 2011-09-17 17:14:46

Revision: 2435
          http://linuxconsole.svn.sourceforge.net/linuxconsole/?rev=2435&view=rev
Author:   skitt
Date:     2011-09-17 17:14:40 +0000 (Sat, 17 Sep 2011)
Log Message:
-----------
Subject: [PATCH] inputattach: Add PenMount 6000, 3000 and 6250 support
From: John Sung <pen...@gm...>

Signed-off-by: John Sung <pen...@gm...>

Modified Paths:
--------------
    trunk/docs/inputattach.1
    trunk/utils/inputattach.c

Modified: trunk/docs/inputattach.1
===================================================================
--- trunk/docs/inputattach.1	2011-09-17 16:26:31 UTC (rev 2434)
+++ trunk/docs/inputattach.1	2011-09-17 17:14:40 UTC (rev 2435)
@@ -81,9 +81,18 @@
 .BR \-newt ", " \-\-newtonkbd
 Newton keyboard.
 .TP
-.BR \-pm ", " \-\-penmount
-Penmount touchscreen.
+.BR \-pm3k ", " \-\-penmount3000
+Penmount 3000 touchscreen.
 .TP
+.BR \-pm6k ", " \-\-penmount6000
+Penmount 6000 touchscreen.
+.TP
+.BR \-pmm1 ", " \-\-penmount6250
+Penmount 6250 touchscreen.
+.TP
+.BR \-pm9k ", " \-\-penmount9000
+Penmount 9000 touchscreen.
+.TP
 .BR \-ps2ser ", " \-\-ps2serkbd
 PS/2 via serial keyboard.
 .TP

Modified: trunk/utils/inputattach.c
===================================================================
--- trunk/utils/inputattach.c	2011-09-17 16:26:31 UTC (rev 2434)
+++ trunk/utils/inputattach.c	2011-09-17 17:14:40 UTC (rev 2435)
@@ -326,6 +326,24 @@
 	return 0;
 }
 
+static int pm6k_init(int fd, unsigned long *id, unsigned long *extra)
+{
+	int i = 0;
+	unsigned char cmd[6] = {0xF1, 0x00, 0x00, 0x00, 0x00, 0x0E};
+	unsigned char data[6] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+	/* Enable the touchscreen */
+	if (write(fd, cmd, sizeof(cmd)) != sizeof(cmd))
+		return -1;
+
+	/* Read ACK */
+	for(i=0;i<sizeof(data);i++)
+		if (readchar(fd, &data[i], 100)<0)
+			break ;
+
+	return 0;
+}
+
 static int fujitsu_init(int fd, unsigned long *id, unsigned long *extra)
 {
 	unsigned char cmd, data;
@@ -565,9 +583,18 @@
 { "--touchwin",		"-tw",	"Touchwindow serial touchscreen",
 	B4800, CS8 | CRTSCTS,
 	SERIO_TOUCHWIN,		0x00,	0x00,	0,	NULL },
-{ "--penmount",		"-pm",	"Penmount touchscreen",
-	B19200, CS8 | CRTSCTS,
+{ "--penmount9000",		"-pm9k",	"PenMount 9000 touchscreen",
+	B19200, CS8,
 	SERIO_PENMOUNT,		0x00,	0x00,	0,	NULL },
+{ "--penmount6000",		"-pm6k",	"PenMount 6000 touchscreen",
+	B19200, CS8,
+	SERIO_PENMOUNT,		0x01,	0x00,	0,	pm6k_init },
+{ "--penmount3000",		"-pm3k",	"PenMount 3000 touchscreen",
+	B38400, CS8,
+	SERIO_PENMOUNT,		0x02,	0x00,	0,	NULL },
+{ "--penmount6250",		"-pmm1",	"PenMount 6250 touchscreen",
+	B19200, CS8,
+	SERIO_PENMOUNT,		0x03,	0x00,	0,	NULL },
 { "--fujitsu",		"-fjt",	"Fujitsu serial touchscreen",
 	B9600, CS8,
 	SERIO_FUJITSU,		0x00,	0x00,	1,	fujitsu_init },

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Linuxconsole-commit] SF.net SVN: linuxconsole:[2434] tags/release-1.4.2/

From: <sk...@us...> - 2011-09-17 16:26:37

Revision: 2434
          http://linuxconsole.svn.sourceforge.net/linuxconsole/?rev=2434&view=rev
Author:   skitt
Date:     2011-09-17 16:26:31 +0000 (Sat, 17 Sep 2011)
Log Message:
-----------
Tagging the 1.4.2 release.

Added Paths:
-----------
    tags/release-1.4.2/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Linuxconsole-commit] SF.net SVN: linuxconsole:[2433] trunk

From: <sk...@us...> - 2011-09-08 05:14:21

Revision: 2433
          http://linuxconsole.svn.sourceforge.net/linuxconsole/?rev=2433&view=rev
Author:   skitt
Date:     2011-09-08 05:14:15 +0000 (Thu, 08 Sep 2011)
Log Message:
-----------
Version 1.4.2.

Modified Paths:
--------------
    trunk/Makefile
    trunk/NEWS
    trunk/README

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2011-09-08 05:10:36 UTC (rev 2432)
+++ trunk/Makefile	2011-09-08 05:14:15 UTC (rev 2433)
@@ -19,7 +19,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301 USA.
 
-VERSION := 1.4.1
+VERSION := 1.4.2
 
 PACKAGE := linuxconsoletools-$(VERSION)
 

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2011-09-08 05:10:36 UTC (rev 2432)
+++ trunk/NEWS	2011-09-08 05:14:15 UTC (rev 2433)
@@ -1,3 +1,17 @@
+Version 1.4.2
+-------------
+
+* The udev rule matching w8001 devices has been split to handle
+  devices using different baud rates, and the different baud rates are
+  documented.
+
+* inputattach no longer resets the line discipline before exiting when
+  it discovers the device is already managed by another inputattach
+  instance.
+
+* jscal-store creates its target directory if necessary.
+
+
 Version 1.4.1
 -------------
 
@@ -4,6 +18,7 @@
 * inputattach correctly handles non-retry errors other than EINTR
   (thanks to Alexander Clouter <al...@di...> for the patch).
 
+
 Version 1.4
 -----------
 

Modified: trunk/README
===================================================================
--- trunk/README	2011-09-08 05:10:36 UTC (rev 2432)
+++ trunk/README	2011-09-08 05:14:15 UTC (rev 2433)
@@ -1,5 +1,5 @@
 			  linuxconsole tools
-			    Release 1.4.1
+			    Release 1.4.2
 		 http://sf.net/projects/linuxconsole/
 
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Linuxconsole-commit] SF.net SVN: linuxconsole:[2432] trunk/docs/inputattach.1

From: <sk...@us...> - 2011-09-08 05:10:44

Revision: 2432
          http://linuxconsole.svn.sourceforge.net/linuxconsole/?rev=2432&view=rev
Author:   skitt
Date:     2011-09-08 05:10:36 +0000 (Thu, 08 Sep 2011)
Log Message:
-----------
Explain baud values for wacom and reformat manpage.

Modified Paths:
--------------
    trunk/docs/inputattach.1

Modified: trunk/docs/inputattach.1
===================================================================
--- trunk/docs/inputattach.1	2011-09-08 05:09:53 UTC (rev 2431)
+++ trunk/docs/inputattach.1	2011-09-08 05:10:36 UTC (rev 2432)
@@ -1,4 +1,4 @@
-.TH inputattach 1 "May 25, 2011" inputattach
+.TH inputattach 1 "August 9, 2011" inputattach
 .SH NAME
 inputattach \- attach a serial line to an input-layer device
 .SH SYNOPSIS
@@ -23,116 +23,119 @@
 Skip device initialization.
 .TP
 .B \-\-baud
-Specify the baud rate to use (for w8001).
+Specify the baud rate to use. (This is only necessary if the default
+rate is incorrect.)
 .SS Modes
 .TP
 .BR \-dump ", " \-\-dump
-Just enable device 
+Just enable device .
 .TP
 .BR \-elo3b ", " \-\-elo261-280
-ELO Touchscreen, 3-byte mode 
+ELO Touchscreen, 3-byte mode.
 .TP
 .BR \-elo4b ", " \-\-elo271-140
-ELO touchscreen, 4-byte mode 
+ELO touchscreen, 4-byte mode.
 .TP
 .BR \-elo6b ", " \-\-elo4002
-ELO touchscreen, 6-byte mode 
+ELO touchscreen, 6-byte mode.
 .TP
 .BR \-elo ", " \-\-elotouch
-ELO touchscreen, 10-byte mode 
+ELO touchscreen, 10-byte mode.
 .TP
 .BR \-fjt ", " \-\-fujitsu
-Fujitsu serial touchscreen 
+Fujitsu serial touchscreen.
 .TP
 .BR \-ipaq ", " \-\-h3600ts
-Ipaq h3600 touchscreen 
+Ipaq h3600 touchscreen.
 .TP
 .BR \-ifor ", " \-\-iforce
-I-Force joystick or wheel 
+I-Force joystick or wheel.
 .TP
 .BR \-ms3 ", " \-\-intellimouse
-Microsoft IntelliMouse 
+Microsoft IntelliMouse.
 .TP
 .BR \-lk ", " \-\-lkkbd
-DEC LK201 / LK401 keyboards 
+DEC LK201 / LK401 keyboards.
 .TP
 .BR \-mag ", " \-\-magellan
-Magellan / SpaceMouse 
+Magellan / SpaceMouse.
 .TP
 .BR \-bare ", " \-\-microsoft
-2-button Microsoft mouse 
+2-button Microsoft mouse.
 .TP
 .BR \-mmw ", " \-\-mmwheel
-Logitech mouse with 4-5 buttons or a wheel 
+Logitech mouse with 4-5 buttons or a wheel.
 .TP
 .BR \-mman ", " \-\-mouseman
-3-button Logitech / Genius mouse 
+3-button Logitech / Genius mouse.
 .TP
 .BR \-msc ", " \-\-mousesystems
-3-button Mouse Systems mouse 
+3-button Mouse Systems mouse.
 .TP
 .BR \-ms ", " \-\-mshack
-3-button mouse in Microsoft mode 
+3-button mouse in Microsoft mode.
 .TP
 .BR \-mtouch ", " \-\-mtouch
-MicroTouch (3M) touchscreen 
+MicroTouch (3M) touchscreen.
 .TP
 .BR \-newt ", " \-\-newtonkbd
-Newton keyboard 
+Newton keyboard.
 .TP
 .BR \-pm ", " \-\-penmount
-Penmount touchscreen 
+Penmount touchscreen.
 .TP
 .BR \-ps2ser ", " \-\-ps2serkbd
-PS/2 via serial keyboard 
+PS/2 via serial keyboard.
 .TP
 .BR \-sbl ", " \-\-spaceball
-SpaceBall 2003 / 3003 / 4000 FLX 
+SpaceBall 2003 / 3003 / 4000 FLX.
 .TP
 .BR \-orb ", " \-\-spaceorb
-SpaceOrb 360 / SpaceBall Avenger 
+SpaceOrb 360 / SpaceBall Avenger.
 .TP
 .BR \-sting ", " \-\-stinger
-Gravis Stinger 
+Gravis Stinger.
 .TP
 .BR \-ipaqkbd ", " \-\-stowawaykbd
-Stowaway keyboard 
+Stowaway keyboard.
 .TP
 .BR \-skb ", " \-\-sunkbd
-Sun Type 4 and Type 5 keyboards 
+Sun Type 4 and Type 5 keyboards.
 .TP
 .BR \-sun ", " \-\-sunmouse
-3-button Sun mouse 
+3-button Sun mouse.
 .TP
 .BR \-taos ", " \-\-taos\-evm
-TAOS evaluation module
+TAOS evaluation module.
 .TP
 .BR \-t213 ", " \-\-touchit213
-Sahara Touch-iT213 Tablet PC 
+Sahara Touch-iT213 Tablet PC.
 .TP
 .BR \-tr ", " \-\-touchright
-Touchright serial touchscreen 
+Touchright serial touchscreen.
 .TP
 .BR \-tw ", " \-\-touchwin
-Touchwindow serial touchscreen 
+Touchwindow serial touchscreen.
 .TP
 .BR \-twidjoy ", " \-\-twiddler-joy
-Handykey Twiddler used as a joystick 
+Handykey Twiddler used as a joystick.
 .TP
 .BR \-twid ", " \-\-twiddler
-Handykey Twiddler chording keyboard 
+Handykey Twiddler chording keyboard.
 .TP
 .BR \-vs ", " \-\-vsxxx-aa
-DEC VSXXX-AA / VSXXX-GA mouse and VSXXX-A tablet 
+DEC VSXXX-AA / VSXXX-GA mouse and VSXXX-A tablet.
 .TP
 .BR \-w8001 ", " \-\-w8001
-Wacom W8001
+Wacom W8001 pen and/or touch devices. The default baud rate, 38400bps,
+allows for touch-only or pen and touch devices; for pen-only devices,
+"\fB\-\-baud 19200\fP" must be specified.
 .TP
 .BR \-war ", " \-\-warrior
-WingMan Warrior 
+WingMan Warrior.
 .TP
 .BR \-zhen ", " \-\-zhen-hua
-Zhen Hua 5-byte protocol
+Zhen Hua 5-byte protocol.
 .SH AUTHORS
 .B inputattach
 was written by Vojtech Pavlik and Arndt Schoenewald, and improved by

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Linuxconsole-commit] SF.net SVN: linuxconsole:[2431] trunk/README

From: <sk...@us...> - 2011-09-08 05:10:00

Revision: 2431
          http://linuxconsole.svn.sourceforge.net/linuxconsole/?rev=2431&view=rev
Author:   skitt
Date:     2011-09-08 05:09:53 +0000 (Thu, 08 Sep 2011)
Log Message:
-----------
Split wacom udev rules and clarify X.org wacm/evdev conflict (Debian #632961, Ubuntu #835634).

Modified Paths:
--------------
    trunk/README

Modified: trunk/README
===================================================================
--- trunk/README	2011-08-09 05:45:18 UTC (rev 2430)
+++ trunk/README	2011-09-08 05:09:53 UTC (rev 2431)
@@ -107,9 +107,18 @@
 
 The following rules configures a Wacom W8001 devices on a Fujitsu
 T2010[2] or on Lenovo X200-series laptops and tablets:
-	SUBSYSTEM=="tty", KERNEL=="ttyS[0-9]*", ATTRS{id}=="FUJ02e5|WACf00c", ACTION=="add|change", RUN+="/usr/bin/inputattach --daemon --baud 19200 --w8001 /dev/%k"
+	SUBSYSTEM=="tty", KERNEL=="ttyS[0-9]*", ATTRS{id}=="FUJ02e5", ACTION=="add|change", RUN+="/usr/bin/inputattach --daemon --baud 19200 --w8001 /dev/%k"
+	SUBSYSTEM=="tty", KERNEL=="ttyS[0-9]*", ATTRS{id}=="WACf00c", ACTION=="add|change", RUN+="/usr/bin/inputattach --daemon --baud 38400 --w8001 /dev/%k"
 
+These rules are liable to cause conflicts with the X.org wacom
+driver. For example, on some Debian-based systems the
+/usr/share/X11/xorg.conf.d/50-wacom.conf configuration file needs to
+be amended so that the "MatchProduct" line matching one of the
+identifiers used above ("FUJ02e5" or "WACf00c", the latter being
+matched by "WACf") no longer contains the matching identifier. The
+appropriate X.org driver when using inputattach in this way is evdev.
 
+
 Contributors
 ------------
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Linuxconsole-commit] SF.net SVN: linuxconsole:[2430] trunk/utils/jscal-store.in

From: <sk...@us...> - 2011-08-09 05:45:23

Revision: 2430
          http://linuxconsole.svn.sourceforge.net/linuxconsole/?rev=2430&view=rev
Author:   skitt
Date:     2011-08-09 05:45:18 +0000 (Tue, 09 Aug 2011)

Log Message:
-----------
Create /var/lib/joystick if necessary (Debian #632623).

Modified Paths:
--------------
    trunk/utils/jscal-store.in

Modified: trunk/utils/jscal-store.in
===================================================================
--- trunk/utils/jscal-store.in	2011-08-09 05:43:09 UTC (rev 2429)
+++ trunk/utils/jscal-store.in	2011-08-09 05:45:18 UTC (rev 2430)
@@ -24,6 +24,14 @@
 
 STORE=/var/lib/joystick/joystick.state
 
+if [ ! -d $(dirname $STORE) ]; then
+    mkdir -p $(dirname $STORE)
+    if [ $? -gt 0 ]; then
+        echo Unable to create directory $(dirname $STORE)! >&2
+        exit 1
+    fi
+fi
+
 # Filter the existing file
 if [ -f $STORE ]; then
     if [ -z "$NAME" ] && [ -z "$VENDOR" ]; then


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Linuxconsole-commit] SF.net SVN: linuxconsole:[2429] trunk/utils/inputattach.c

From: <sk...@us...> - 2011-08-09 05:43:15

Revision: 2429
          http://linuxconsole.svn.sourceforge.net/linuxconsole/?rev=2429&view=rev
Author:   skitt
Date:     2011-08-09 05:43:09 +0000 (Tue, 09 Aug 2011)

Log Message:
-----------
Avoid resetting the line discipline if another instance of inputattach is already running.

Modified Paths:
--------------
    trunk/utils/inputattach.c

Modified: trunk/utils/inputattach.c
===================================================================
--- trunk/utils/inputattach.c	2011-06-25 13:19:12 UTC (rev 2428)
+++ trunk/utils/inputattach.c	2011-08-09 05:43:09 UTC (rev 2429)
@@ -626,6 +626,7 @@
 	int baud = -1;
 	int ignore_init_res = 0;
 	int no_init = 0;
+	int one_read = 0;
 
 	for (i = 1; i < argc; i++) {
 		if (!strcasecmp(argv[i], "--help")) {
@@ -746,11 +747,17 @@
 		if (i == -1) {
 			if (RETRY_ERROR(errno))
 				continue;
+		} else {
+			one_read = 1;
 		}
 	} while (!i);
 
 	ldisc = 0;
-	ioctl(fd, TIOCSETD, &ldisc);
+	if (one_read) {
+		// If we've never managed to read, avoid resetting the line
+		// discipline - another inputattach is probably running
+		ioctl(fd, TIOCSETD, &ldisc);
+	}
 	close(fd);
 
 	return retval;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Linuxconsole-commit] SF.net SVN: linuxconsole:[2428] tags/release-1.4.1/

From: <sk...@us...> - 2011-06-25 13:19:17

Revision: 2428
          http://linuxconsole.svn.sourceforge.net/linuxconsole/?rev=2428&view=rev
Author:   skitt
Date:     2011-06-25 13:19:12 +0000 (Sat, 25 Jun 2011)

Log Message:
-----------
Tagging the 1.4.1 release.

Added Paths:
-----------
    tags/release-1.4.1/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Linuxconsole-commit] SF.net SVN: linuxconsole:[2427] trunk

From: <sk...@us...> - 2011-06-25 13:17:03

Revision: 2427
          http://linuxconsole.svn.sourceforge.net/linuxconsole/?rev=2427&view=rev
Author:   skitt
Date:     2011-06-25 13:16:57 +0000 (Sat, 25 Jun 2011)

Log Message:
-----------
Handle other retry errors correctly (thanks to Alexander Clouter for the patch). Release 1.4.1.

Modified Paths:
--------------
    trunk/Makefile
    trunk/NEWS
    trunk/README
    trunk/utils/inputattach.c

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2011-06-25 13:14:12 UTC (rev 2426)
+++ trunk/Makefile	2011-06-25 13:16:57 UTC (rev 2427)
@@ -19,7 +19,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301 USA.
 
-VERSION := 1.4
+VERSION := 1.4.1
 
 PACKAGE := linuxconsoletools-$(VERSION)
 

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2011-06-25 13:14:12 UTC (rev 2426)
+++ trunk/NEWS	2011-06-25 13:16:57 UTC (rev 2427)
@@ -1,3 +1,9 @@
+Version 1.4.1
+-------------
+
+* inputattach correctly handles non-retry errors other than EINTR
+  (thanks to Alexander Clouter <al...@di...> for the patch).
+
 Version 1.4
 -----------
 

Modified: trunk/README
===================================================================
--- trunk/README	2011-06-25 13:14:12 UTC (rev 2426)
+++ trunk/README	2011-06-25 13:16:57 UTC (rev 2427)
@@ -1,5 +1,5 @@
 			  linuxconsole tools
-			     Release 1.4
+			    Release 1.4.1
 		 http://sf.net/projects/linuxconsole/
 
 
@@ -121,7 +121,7 @@
   functions.
 * Claudio Nieder: Sahara Touch-iT213 support.
 * Florian Fainelli: evtest fixes.
-* Alexander Clouter: W8001 support.
+* Alexander Clouter: W8001 support and error-handling fixes.
 * Roberto Neri: much discussion, and fixes and improvements to
   jscal-store/jscal-restore and the udev rules given above.
 * Jean Delvare: inputattach improvements, TAOS support.

Modified: trunk/utils/inputattach.c
===================================================================
--- trunk/utils/inputattach.c	2011-06-25 13:14:12 UTC (rev 2426)
+++ trunk/utils/inputattach.c	2011-06-25 13:16:57 UTC (rev 2427)
@@ -607,6 +607,9 @@
 	puts("");
 }
 
+/* palmed wisdom from http://stackoverflow.com/questions/1674162/ */
+#define RETRY_ERROR(x) (x == EAGAIN || x == EWOULDBLOCK || x == EINTR)
+
 int main(int argc, char **argv)
 {
 	unsigned long devt;
@@ -738,7 +741,13 @@
 		retval = EXIT_FAILURE;
 	}
 
-	for (errno = 0; errno != EINTR; read(fd, NULL, 0)) ;
+	do {
+		i = read(fd, NULL, 0);
+		if (i == -1) {
+			if (RETRY_ERROR(errno))
+				continue;
+		}
+	} while (!i);
 
 	ldisc = 0;
 	ioctl(fd, TIOCSETD, &ldisc);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Linuxconsole-commit] SF.net SVN: linuxconsole:[2426] tags/release-1.4/

From: <sk...@us...> - 2011-06-25 13:14:18

Revision: 2426
          http://linuxconsole.svn.sourceforge.net/linuxconsole/?rev=2426&view=rev
Author:   skitt
Date:     2011-06-25 13:14:12 +0000 (Sat, 25 Jun 2011)

Log Message:
-----------
Tagging the 1.4 release.

Added Paths:
-----------
    tags/release-1.4/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Linuxconsole-commit] SF.net SVN: linuxconsole:[2425] trunk/Makefile

From: <sk...@us...> - 2011-06-25 13:09:51

Revision: 2425
          http://linuxconsole.svn.sourceforge.net/linuxconsole/?rev=2425&view=rev
Author:   skitt
Date:     2011-06-25 13:09:45 +0000 (Sat, 25 Jun 2011)

Log Message:
-----------
Version 1.4.

Modified Paths:
--------------
    trunk/Makefile

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2011-06-20 19:06:51 UTC (rev 2424)
+++ trunk/Makefile	2011-06-25 13:09:45 UTC (rev 2425)
@@ -19,7 +19,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301 USA.
 
-VERSION := 1.4rc1
+VERSION := 1.4
 
 PACKAGE := linuxconsoletools-$(VERSION)
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Linuxconsole-commit] SF.net SVN: linuxconsole:[2424] trunk/README

From: <sk...@us...> - 2011-06-20 19:06:57

Revision: 2424
          http://linuxconsole.svn.sourceforge.net/linuxconsole/?rev=2424&view=rev
Author:   skitt
Date:     2011-06-20 19:06:51 +0000 (Mon, 20 Jun 2011)

Log Message:
-----------
Correct udev rules and prepare 1.4.

Modified Paths:
--------------
    trunk/README

Modified: trunk/README
===================================================================
--- trunk/README	2011-06-20 19:05:31 UTC (rev 2423)
+++ trunk/README	2011-06-20 19:06:51 UTC (rev 2424)
@@ -1,5 +1,5 @@
 			  linuxconsole tools
-			    Release 1.4rc2
+			     Release 1.4
 		 http://sf.net/projects/linuxconsole/
 
 
@@ -97,17 +97,17 @@
 	KERNEL=="js*", ACTION=="add", RUN+="/lib/udev/jscal-restore %E{DEVNAME}"
 
 The following rule forces flaky Acrux gamepads to stay awake:
-	KERNEL=="js*", ACTION=="add", ATTRS{name}=="ACRUX USB GAMEPAD 8116", RUN+="/bin/sleep 5000 < %p"
+	KERNEL=="js*", ACTION=="add", ATTRS{name}=="ACRUX USB GAMEPAD 8116", RUN+="/bin/sleep 5000 < /dev/%k"
 (This should only be necessary on kernels older than 2.6.39-rc1.)
 
 The following rule configures a Mouse Systems mouse on the first
 serial port:
-	KERNEL=="ttyS0", ACTION=="add", RUN+="/usr/bin/inputattach --daemon -msc %p"
+	KERNEL=="ttyS0", ACTION=="add", RUN+="/usr/bin/inputattach --daemon -msc /dev/%k"
 If you need to wait for /usr you can adapt the recipe above.
 
 The following rules configures a Wacom W8001 devices on a Fujitsu
-T2010[2]:
-	SUBSYSTEM=="tty", KERNEL=="ttyS[0-9]*", ATTRS{id}=="FUJ02e5", ACTION=="add", RUN+="/usr/bin/inputattach --daemon --baud 19200 --w8001 /dev/%k"
+T2010[2] or on Lenovo X200-series laptops and tablets:
+	SUBSYSTEM=="tty", KERNEL=="ttyS[0-9]*", ATTRS{id}=="FUJ02e5|WACf00c", ACTION=="add|change", RUN+="/usr/bin/inputattach --daemon --baud 19200 --w8001 /dev/%k"
 
 
 Contributors
@@ -125,6 +125,8 @@
 * Roberto Neri: much discussion, and fixes and improvements to
   jscal-store/jscal-restore and the udev rules given above.
 * Jean Delvare: inputattach improvements, TAOS support.
+* Brian Murray and Kees Cook: Lenovo W8001 support.
+* Raoul Bönish: fixes for the udev rules.
 
 
 License


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Linuxconsole-commit] SF.net SVN: linuxconsole:[2423] trunk/docs

From: <sk...@us...> - 2011-06-20 19:05:38

Revision: 2423
          http://linuxconsole.svn.sourceforge.net/linuxconsole/?rev=2423&view=rev
Author:   skitt
Date:     2011-06-20 19:05:31 +0000 (Mon, 20 Jun 2011)

Log Message:
-----------
Update documentation.

Modified Paths:
--------------
    trunk/docs/inputattach.1
    trunk/docs/jscal-restore.1
    trunk/docs/jscal-store.1
    trunk/docs/jscal.1
    trunk/docs/jstest.1

Modified: trunk/docs/inputattach.1
===================================================================
--- trunk/docs/inputattach.1	2011-05-16 21:05:54 UTC (rev 2422)
+++ trunk/docs/inputattach.1	2011-06-20 19:05:31 UTC (rev 2423)
@@ -1,4 +1,4 @@
-.TH inputattach 1 "March 6, 2011" inputattach
+.TH inputattach 1 "May 25, 2011" inputattach
 .SH NAME
 inputattach \- attach a serial line to an input-layer device
 .SH SYNOPSIS
@@ -135,12 +135,8 @@
 Zhen Hua 5-byte protocol
 .SH AUTHORS
 .B inputattach
-was written by Vojtech Pavlik and Arndt Schoenewald.
-The version packaged for Debian includes updates by Dmitry Torokhov
-and Sahara Touch-iT213 support by Claudio Nieder.
+was written by Vojtech Pavlik and Arndt Schoenewald, and improved by
+many others; see the linuxconsole tools documentation for details.
 .PP
 This manual page was written by Stephen Kitt <st...@sk...>, for the Debian
 GNU/Linux system (but may be used by others).
-It was last modified for
-.B inputattach
-version 1.24, dated April 4, 2007.

Modified: trunk/docs/jscal-restore.1
===================================================================
--- trunk/docs/jscal-restore.1	2011-05-16 21:05:54 UTC (rev 2422)
+++ trunk/docs/jscal-restore.1	2011-06-20 19:05:31 UTC (rev 2423)
@@ -1,4 +1,4 @@
-.TH jscal-restore 1 "April 7, 2010" jscal-restore
+.TH jscal-restore 1 "May 25, 2011" jscal-restore
 .SH NAME
 jscal-restore \- restores joystick calibration
 .SH SYNOPSIS
@@ -11,8 +11,10 @@
 .B jscal-store
 command.
 .PP
-On Debian systems any stored calibration settings are restored when
-the relevant device is connected, using udev.
+An appropriate rule can be set up with udev so that any stored
+calibration settings are restored when the relevant device is
+connected. Some distributions (at least Debian, Ubuntu and Slackware)
+provide joystick packages which install such rules automatically.
 .SH FILES
 .TP
 /var/lib/joystick/joystick.state

Modified: trunk/docs/jscal-store.1
===================================================================
--- trunk/docs/jscal-store.1	2011-05-16 21:05:54 UTC (rev 2422)
+++ trunk/docs/jscal-store.1	2011-06-20 19:05:31 UTC (rev 2423)
@@ -11,8 +11,10 @@
 .B jscal-restore
 command.
 .PP
-On Debian systems any stored calibration settings are restored when
-the relevant device is connected, using udev.
+An appropriate rule can be set up with udev so that any stored
+calibration settings are restored when the relevant device is
+connected. Some distributions (at least Debian, Ubuntu and Slackware)
+provide joystick packages which install such rules automatically.
 .SH FILES
 .TP
 /var/lib/joystick/joystick.state

Modified: trunk/docs/jscal.1
===================================================================
--- trunk/docs/jscal.1	2011-05-16 21:05:54 UTC (rev 2422)
+++ trunk/docs/jscal.1	2011-06-20 19:05:31 UTC (rev 2423)
@@ -73,12 +73,8 @@
 \fBffset\fP(1), \fBjstest\fP(1), \fBjscal\-store\fP(1).
 .SH AUTHORS
 .B jscal
-was written by Vojtech Pavlik.
-The version packaged for Debian includes patches by Dr. László Kaján,
-Johann Walles and Krzysztof A. Sobiecki.
+was written by Vojtech Pavlik and improved by many others; see the
+linuxconsole tools documentation for details.
 .PP
 This manual page was written by Stephen Kitt <st...@sk...>, for the Debian
 GNU/Linux system (but may be used by others).
-It was last modified for
-.B jscal
-version 1.2 dated October 19, 2004.

Modified: trunk/docs/jstest.1
===================================================================
--- trunk/docs/jstest.1	2011-05-16 21:05:54 UTC (rev 2422)
+++ trunk/docs/jstest.1	2011-06-20 19:05:31 UTC (rev 2423)
@@ -34,6 +34,3 @@
 .PP
 This manual page was written by Stephen Kitt <st...@sk...>, for the Debian
 GNU/Linux system (but may be used by others).
-It was last modified for
-.B jstest
-version 1.2, dated March 22, 2005.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Linuxconsole-commit] SF.net SVN: linuxconsole:[2422] trunk

From: <sk...@us...> - 2011-05-16 21:06:03

Revision: 2422
          http://linuxconsole.svn.sourceforge.net/linuxconsole/?rev=2422&view=rev
Author:   skitt
Date:     2011-05-16 21:05:54 +0000 (Mon, 16 May 2011)

Log Message:
-----------
Avoid quitting on recoverable signals; thanks to Kees Cook <ke...@ub...> for the patch.

Modified Paths:
--------------
    trunk/NEWS
    trunk/utils/inputattach.c

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2011-04-05 07:24:27 UTC (rev 2421)
+++ trunk/NEWS	2011-05-16 21:05:54 UTC (rev 2422)
@@ -1,3 +1,10 @@
+Version 1.4
+-----------
+
+* inputattach no longer aborts when it receives a recoverable signal
+  (thanks to Kees Cook <ke...@ub...> for the patch).
+
+
 Version 1.4rc1
 --------------
 

Modified: trunk/utils/inputattach.c
===================================================================
--- trunk/utils/inputattach.c	2011-04-05 07:24:27 UTC (rev 2421)
+++ trunk/utils/inputattach.c	2011-05-16 21:05:54 UTC (rev 2422)
@@ -738,7 +738,7 @@
 		retval = EXIT_FAILURE;
 	}
 
-	read(fd, NULL, 0);
+	for (errno = 0; errno != EINTR; read(fd, NULL, 0)) ;
 
 	ldisc = 0;
 	ioctl(fd, TIOCSETD, &ldisc);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Linuxconsole-commit] SF.net SVN: linuxconsole:[2421] trunk

From: <sk...@us...> - 2011-04-05 07:24:33

Revision: 2421
          http://linuxconsole.svn.sourceforge.net/linuxconsole/?rev=2421&view=rev
Author:   skitt
Date:     2011-04-05 07:24:27 +0000 (Tue, 05 Apr 2011)

Log Message:
-----------
Drop evtest and refer users to Peter Hutterer's repository.
Prepare 1.4rc2.
Mention the project's URL.
Split compilation and installation, and mention that SDL is required for ffmvforce.

Modified Paths:
--------------
    trunk/README
    trunk/docs/Makefile
    trunk/utils/Makefile

Removed Paths:
-------------
    trunk/docs/evtest.1
    trunk/utils/evtest.c

Modified: trunk/README
===================================================================
--- trunk/README	2011-04-05 07:02:39 UTC (rev 2420)
+++ trunk/README	2011-04-05 07:24:27 UTC (rev 2421)
@@ -1,15 +1,16 @@
 			  linuxconsole tools
-			    Release 1.4rc1
+			    Release 1.4rc2
+		 http://sf.net/projects/linuxconsole/
 
 
 This package contains the following utilities and associated
 documentation:
-* evtest - input layer event monitor
 * inputattach - connects legacy serial devices to the input layer
 * joystick utilities - calibrate and test joysticks and joypads
 
-The evtest and inputattach manpages provide more details on their
-operation.
+The evtest tool, which used to be part of this package, is now
+maintained separately at http://cgit.freedesktop.org/evtest/ and
+https://bugzilla.freedesktop.org/enter_bug.cgi?product=evtest
 
 
 Joystick utilities
@@ -37,7 +38,14 @@
 Installation
 ------------
 
+Most of the utilities have no particular requirement beyond a libc and
+the Linux input layer headers (normally part of your libc
+installation). ffmvforce requires SDL (libsdl1.2-dev on Debian
+derivatives).
+
 To install the utilities and their manpages, run
+	make
+and then as root
 	make install
 from the distribution's top directory. This will install everything
 into /usr/local. Should you wish to install the tools elsewhere, you
@@ -124,7 +132,6 @@
 
 The linuxconsole tools are
 	Copyright © 1996-2005 Vojtech Pavlik
-	Copyright © 2001 Romain Dolbeau
 	Copyright © 2001 Oliver Hamann
 	Copyright © 2001-2002 Johann Deneux
 	Copyright © 2001 Arndt Schoenewald

Modified: trunk/docs/Makefile
===================================================================
--- trunk/docs/Makefile	2011-04-05 07:02:39 UTC (rev 2420)
+++ trunk/docs/Makefile	2011-04-05 07:24:27 UTC (rev 2421)
@@ -19,7 +19,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301 USA.
 
-MANPAGES	= evtest.1 inputattach.1 jstest.1 jscal.1 fftest.1 \
+MANPAGES	= inputattach.1 jstest.1 jscal.1 fftest.1 \
 		  ffmvforce.1 ffset.1 ffcfstress.1 jscal-store.1 \
 		  jscal-restore.1
 

Deleted: trunk/docs/evtest.1
===================================================================
--- trunk/docs/evtest.1	2011-04-05 07:02:39 UTC (rev 2420)
+++ trunk/docs/evtest.1	2011-04-05 07:24:27 UTC (rev 2421)
@@ -1,25 +0,0 @@
-.TH evtest 1 "July 23, 2008" evtest
-.SH NAME
-evtest \- Input device event monitor
-.SH SYNOPSIS
-.B evtest 
-.I /dev/input/eventX
-.SH DESCRIPTION
-evtest displays information on the input device specified on the
-command line, including all the events supported by the device.
-It then monitors the  device and displays all the events layer events
-generated.
-.PP
-evtest needs to be able to read from the device; in most cases this
-means it must be run as root.
-.SH AUTHOR
-.B evtest
-was written by Vojtech Pavlik <vo...@su...>.
-.PP
-This manual page was written by Stephen Kitt <st...@sk...>, based on
-that present in the
-.B lineakd
-package, for the Debian GNU/Linux system (but may be used by others).
-It was last modified for
-.B evtest
-version 1.23, dated February 6, 2005.

Modified: trunk/utils/Makefile
===================================================================
--- trunk/utils/Makefile	2011-04-05 07:02:39 UTC (rev 2420)
+++ trunk/utils/Makefile	2011-04-05 07:24:27 UTC (rev 2421)
@@ -28,7 +28,7 @@
 CC		= gcc
 CFLAGS		= -g -O2 -Wall -I../linux/include
 
-PROGRAMS	= evtest inputattach jstest jscal fftest ffmvforce ffset \
+PROGRAMS	= inputattach jstest jscal fftest ffmvforce ffset \
 		  ffcfstress jscal-restore jscal-store
 
 PREFIX          ?= /usr/local

Deleted: trunk/utils/evtest.c
===================================================================
--- trunk/utils/evtest.c	2011-04-05 07:02:39 UTC (rev 2420)
+++ trunk/utils/evtest.c	2011-04-05 07:24:27 UTC (rev 2421)
@@ -1,394 +0,0 @@
-/*
- * $Id$
- *
- *  Copyright (c) 1999-2000 Vojtech Pavlik
- *
- *  Event device test program
- */
-
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or 
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA.
- */
-
-#include <stdint.h>
-
-#include <linux/input.h>
-
-#include <string.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdio.h>
-
-#ifndef EV_SYN
-#define EV_SYN 0
-#endif
-
-char *events[EV_MAX + 1] = {
-	[0 ... EV_MAX] = NULL,
-	[EV_SYN] = "Sync",			[EV_KEY] = "Key",
-	[EV_REL] = "Relative",			[EV_ABS] = "Absolute",
-	[EV_MSC] = "Misc",			[EV_LED] = "LED",
-	[EV_SND] = "Sound",			[EV_REP] = "Repeat",
-	[EV_FF] = "ForceFeedback",		[EV_PWR] = "Power",
-	[EV_FF_STATUS] = "ForceFeedbackStatus",
-};
-
-char *keys[KEY_MAX + 1] = {
-	[0 ... KEY_MAX] = NULL,
-	[KEY_RESERVED] = "Reserved",		[KEY_ESC] = "Esc",
-	[KEY_1] = "1",				[KEY_2] = "2",
-	[KEY_3] = "3",				[KEY_4] = "4",
-	[KEY_5] = "5",				[KEY_6] = "6",
-	[KEY_7] = "7",				[KEY_8] = "8",
-	[KEY_9] = "9",				[KEY_0] = "0",
-	[KEY_MINUS] = "Minus",			[KEY_EQUAL] = "Equal",
-	[KEY_BACKSPACE] = "Backspace",		[KEY_TAB] = "Tab",
-	[KEY_Q] = "Q",				[KEY_W] = "W",
-	[KEY_E] = "E",				[KEY_R] = "R",
-	[KEY_T] = "T",				[KEY_Y] = "Y",
-	[KEY_U] = "U",				[KEY_I] = "I",
-	[KEY_O] = "O",				[KEY_P] = "P",
-	[KEY_LEFTBRACE] = "LeftBrace",		[KEY_RIGHTBRACE] = "RightBrace",
-	[KEY_ENTER] = "Enter",			[KEY_LEFTCTRL] = "LeftControl",
-	[KEY_A] = "A",				[KEY_S] = "S",
-	[KEY_D] = "D",				[KEY_F] = "F",
-	[KEY_G] = "G",				[KEY_H] = "H",
-	[KEY_J] = "J",				[KEY_K] = "K",
-	[KEY_L] = "L",				[KEY_SEMICOLON] = "Semicolon",
-	[KEY_APOSTROPHE] = "Apostrophe",	[KEY_GRAVE] = "Grave",
-	[KEY_LEFTSHIFT] = "LeftShift",		[KEY_BACKSLASH] = "BackSlash",
-	[KEY_Z] = "Z",				[KEY_X] = "X",
-	[KEY_C] = "C",				[KEY_V] = "V",
-	[KEY_B] = "B",				[KEY_N] = "N",
-	[KEY_M] = "M",				[KEY_COMMA] = "Comma",
-	[KEY_DOT] = "Dot",			[KEY_SLASH] = "Slash",
-	[KEY_RIGHTSHIFT] = "RightShift",	[KEY_KPASTERISK] = "KPAsterisk",
-	[KEY_LEFTALT] = "LeftAlt",		[KEY_SPACE] = "Space",
-	[KEY_CAPSLOCK] = "CapsLock",		[KEY_F1] = "F1",
-	[KEY_F2] = "F2",			[KEY_F3] = "F3",
-	[KEY_F4] = "F4",			[KEY_F5] = "F5",
-	[KEY_F6] = "F6",			[KEY_F7] = "F7",
-	[KEY_F8] = "F8",			[KEY_F9] = "F9",
-	[KEY_F10] = "F10",			[KEY_NUMLOCK] = "NumLock",
-	[KEY_SCROLLLOCK] = "ScrollLock",	[KEY_KP7] = "KP7",
-	[KEY_KP8] = "KP8",			[KEY_KP9] = "KP9",
-	[KEY_KPMINUS] = "KPMinus",		[KEY_KP4] = "KP4",
-	[KEY_KP5] = "KP5",			[KEY_KP6] = "KP6",
-	[KEY_KPPLUS] = "KPPlus",		[KEY_KP1] = "KP1",
-	[KEY_KP2] = "KP2",			[KEY_KP3] = "KP3",
-	[KEY_KP0] = "KP0",			[KEY_KPDOT] = "KPDot",
-	[KEY_ZENKAKUHANKAKU] = "Zenkaku/Hankaku", [KEY_102ND] = "102nd",
-	[KEY_F11] = "F11",			[KEY_F12] = "F12",
-	[KEY_RO] = "RO",			[KEY_KATAKANA] = "Katakana",
-	[KEY_HIRAGANA] = "HIRAGANA",		[KEY_HENKAN] = "Henkan",
-	[KEY_KATAKANAHIRAGANA] = "Katakana/Hiragana", [KEY_MUHENKAN] = "Muhenkan",
-	[KEY_KPJPCOMMA] = "KPJpComma",		[KEY_KPENTER] = "KPEnter",
-	[KEY_RIGHTCTRL] = "RightCtrl",		[KEY_KPSLASH] = "KPSlash",
-	[KEY_SYSRQ] = "SysRq",			[KEY_RIGHTALT] = "RightAlt",
-	[KEY_LINEFEED] = "LineFeed",		[KEY_HOME] = "Home",
-	[KEY_UP] = "Up",			[KEY_PAGEUP] = "PageUp",
-	[KEY_LEFT] = "Left",			[KEY_RIGHT] = "Right",
-	[KEY_END] = "End",			[KEY_DOWN] = "Down",
-	[KEY_PAGEDOWN] = "PageDown",		[KEY_INSERT] = "Insert",
-	[KEY_DELETE] = "Delete",		[KEY_MACRO] = "Macro",
-	[KEY_MUTE] = "Mute",			[KEY_VOLUMEDOWN] = "VolumeDown",
-	[KEY_VOLUMEUP] = "VolumeUp",		[KEY_POWER] = "Power",
-	[KEY_KPEQUAL] = "KPEqual",		[KEY_KPPLUSMINUS] = "KPPlusMinus",
-	[KEY_PAUSE] = "Pause",			[KEY_KPCOMMA] = "KPComma",
-	[KEY_HANGUEL] = "Hanguel",		[KEY_HANJA] = "Hanja",
-	[KEY_YEN] = "Yen",			[KEY_LEFTMETA] = "LeftMeta",
-	[KEY_RIGHTMETA] = "RightMeta",		[KEY_COMPOSE] = "Compose",
-	[KEY_STOP] = "Stop",			[KEY_AGAIN] = "Again",
-	[KEY_PROPS] = "Props",			[KEY_UNDO] = "Undo",
-	[KEY_FRONT] = "Front",			[KEY_COPY] = "Copy",
-	[KEY_OPEN] = "Open",			[KEY_PASTE] = "Paste",
-	[KEY_FIND] = "Find",			[KEY_CUT] = "Cut",
-	[KEY_HELP] = "Help",			[KEY_MENU] = "Menu",
-	[KEY_CALC] = "Calc",			[KEY_SETUP] = "Setup",
-	[KEY_SLEEP] = "Sleep",			[KEY_WAKEUP] = "WakeUp",
-	[KEY_FILE] = "File",			[KEY_SENDFILE] = "SendFile",
-	[KEY_DELETEFILE] = "DeleteFile",	[KEY_XFER] = "X-fer",
-	[KEY_PROG1] = "Prog1",			[KEY_PROG2] = "Prog2",
-	[KEY_WWW] = "WWW",			[KEY_MSDOS] = "MSDOS",
-	[KEY_COFFEE] = "Coffee",		[KEY_DIRECTION] = "Direction",
-	[KEY_CYCLEWINDOWS] = "CycleWindows",	[KEY_MAIL] = "Mail",
-	[KEY_BOOKMARKS] = "Bookmarks",		[KEY_COMPUTER] = "Computer",
-	[KEY_BACK] = "Back",			[KEY_FORWARD] = "Forward",
-	[KEY_CLOSECD] = "CloseCD",		[KEY_EJECTCD] = "EjectCD",
-	[KEY_EJECTCLOSECD] = "EjectCloseCD",	[KEY_NEXTSONG] = "NextSong",
-	[KEY_PLAYPAUSE] = "PlayPause",		[KEY_PREVIOUSSONG] = "PreviousSong",
-	[KEY_STOPCD] = "StopCD",		[KEY_RECORD] = "Record",
-	[KEY_REWIND] = "Rewind",		[KEY_PHONE] = "Phone",
-	[KEY_ISO] = "ISOKey",			[KEY_CONFIG] = "Config",
-	[KEY_HOMEPAGE] = "HomePage",		[KEY_REFRESH] = "Refresh",
-	[KEY_EXIT] = "Exit",			[KEY_MOVE] = "Move",
-	[KEY_EDIT] = "Edit",			[KEY_SCROLLUP] = "ScrollUp",
-	[KEY_SCROLLDOWN] = "ScrollDown",	[KEY_KPLEFTPAREN] = "KPLeftParenthesis",
-	[KEY_KPRIGHTPAREN] = "KPRightParenthesis", [KEY_F13] = "F13",
-	[KEY_F14] = "F14",			[KEY_F15] = "F15",
-	[KEY_F16] = "F16",			[KEY_F17] = "F17",
-	[KEY_F18] = "F18",			[KEY_F19] = "F19",
-	[KEY_F20] = "F20",			[KEY_F21] = "F21",
-	[KEY_F22] = "F22",			[KEY_F23] = "F23",
-	[KEY_F24] = "F24",			[KEY_PLAYCD] = "PlayCD",
-	[KEY_PAUSECD] = "PauseCD",		[KEY_PROG3] = "Prog3",
-	[KEY_PROG4] = "Prog4",			[KEY_SUSPEND] = "Suspend",
-	[KEY_CLOSE] = "Close",			[KEY_PLAY] = "Play",
-	[KEY_FASTFORWARD] = "Fast Forward",	[KEY_BASSBOOST] = "Bass Boost",
-	[KEY_PRINT] = "Print",			[KEY_HP] = "HP",
-	[KEY_CAMERA] = "Camera",		[KEY_SOUND] = "Sound",
-	[KEY_QUESTION] = "Question",		[KEY_EMAIL] = "Email",
-	[KEY_CHAT] = "Chat",			[KEY_SEARCH] = "Search",
-	[KEY_CONNECT] = "Connect",		[KEY_FINANCE] = "Finance",
-	[KEY_SPORT] = "Sport",			[KEY_SHOP] = "Shop",
-	[KEY_ALTERASE] = "Alternate Erase",	[KEY_CANCEL] = "Cancel",
-	[KEY_BRIGHTNESSDOWN] = "Brightness down", [KEY_BRIGHTNESSUP] = "Brightness up",
-	[KEY_MEDIA] = "Media",			[KEY_UNKNOWN] = "Unknown",
-	[BTN_0] = "Btn0",			[BTN_1] = "Btn1",
-	[BTN_2] = "Btn2",			[BTN_3] = "Btn3",
-	[BTN_4] = "Btn4",			[BTN_5] = "Btn5",
-	[BTN_6] = "Btn6",			[BTN_7] = "Btn7",
-	[BTN_8] = "Btn8",			[BTN_9] = "Btn9",
-	[BTN_LEFT] = "LeftBtn",			[BTN_RIGHT] = "RightBtn",
-	[BTN_MIDDLE] = "MiddleBtn",		[BTN_SIDE] = "SideBtn",
-	[BTN_EXTRA] = "ExtraBtn",		[BTN_FORWARD] = "ForwardBtn",
-	[BTN_BACK] = "BackBtn",			[BTN_TASK] = "TaskBtn",
-	[BTN_TRIGGER] = "Trigger",		[BTN_THUMB] = "ThumbBtn",
-	[BTN_THUMB2] = "ThumbBtn2",		[BTN_TOP] = "TopBtn",
-	[BTN_TOP2] = "TopBtn2",			[BTN_PINKIE] = "PinkieBtn",
-	[BTN_BASE] = "BaseBtn",			[BTN_BASE2] = "BaseBtn2",
-	[BTN_BASE3] = "BaseBtn3",		[BTN_BASE4] = "BaseBtn4",
-	[BTN_BASE5] = "BaseBtn5",		[BTN_BASE6] = "BaseBtn6",
-	[BTN_DEAD] = "BtnDead",			[BTN_A] = "BtnA",
-	[BTN_B] = "BtnB",			[BTN_C] = "BtnC",
-	[BTN_X] = "BtnX",			[BTN_Y] = "BtnY",
-	[BTN_Z] = "BtnZ",			[BTN_TL] = "BtnTL",
-	[BTN_TR] = "BtnTR",			[BTN_TL2] = "BtnTL2",
-	[BTN_TR2] = "BtnTR2",			[BTN_SELECT] = "BtnSelect",
-	[BTN_START] = "BtnStart",		[BTN_MODE] = "BtnMode",
-	[BTN_THUMBL] = "BtnThumbL",		[BTN_THUMBR] = "BtnThumbR",
-	[BTN_TOOL_PEN] = "ToolPen",		[BTN_TOOL_RUBBER] = "ToolRubber",
-	[BTN_TOOL_BRUSH] = "ToolBrush",		[BTN_TOOL_PENCIL] = "ToolPencil",
-	[BTN_TOOL_AIRBRUSH] = "ToolAirbrush",	[BTN_TOOL_FINGER] = "ToolFinger",
-	[BTN_TOOL_MOUSE] = "ToolMouse",		[BTN_TOOL_LENS] = "ToolLens",
-	[BTN_TOUCH] = "Touch",			[BTN_STYLUS] = "Stylus",
-	[BTN_STYLUS2] = "Stylus2",		[BTN_TOOL_DOUBLETAP] = "Tool Doubletap",
-	[BTN_TOOL_TRIPLETAP] = "Tool Tripletap", [BTN_GEAR_DOWN] = "WheelBtn",
-	[BTN_GEAR_UP] = "Gear up",		[KEY_OK] = "Ok",
-	[KEY_SELECT] = "Select",		[KEY_GOTO] = "Goto",
-	[KEY_CLEAR] = "Clear",			[KEY_POWER2] = "Power2",
-	[KEY_OPTION] = "Option",		[KEY_INFO] = "Info",
-	[KEY_TIME] = "Time",			[KEY_VENDOR] = "Vendor",
-	[KEY_ARCHIVE] = "Archive",		[KEY_PROGRAM] = "Program",
-	[KEY_CHANNEL] = "Channel",		[KEY_FAVORITES] = "Favorites",
-	[KEY_EPG] = "EPG",			[KEY_PVR] = "PVR",
-	[KEY_MHP] = "MHP",			[KEY_LANGUAGE] = "Language",
-	[KEY_TITLE] = "Title",			[KEY_SUBTITLE] = "Subtitle",
-	[KEY_ANGLE] = "Angle",			[KEY_ZOOM] = "Zoom",
-	[KEY_MODE] = "Mode",			[KEY_KEYBOARD] = "Keyboard",
-	[KEY_SCREEN] = "Screen",		[KEY_PC] = "PC",
-	[KEY_TV] = "TV",			[KEY_TV2] = "TV2",
-	[KEY_VCR] = "VCR",			[KEY_VCR2] = "VCR2",
-	[KEY_SAT] = "Sat",			[KEY_SAT2] = "Sat2",
-	[KEY_CD] = "CD",			[KEY_TAPE] = "Tape",
-	[KEY_RADIO] = "Radio",			[KEY_TUNER] = "Tuner",
-	[KEY_PLAYER] = "Player",		[KEY_TEXT] = "Text",
-	[KEY_DVD] = "DVD",			[KEY_AUX] = "Aux",
-	[KEY_MP3] = "MP3",			[KEY_AUDIO] = "Audio",
-	[KEY_VIDEO] = "Video",			[KEY_DIRECTORY] = "Directory",
-	[KEY_LIST] = "List",			[KEY_MEMO] = "Memo",
-	[KEY_CALENDAR] = "Calendar",		[KEY_RED] = "Red",
-	[KEY_GREEN] = "Green",			[KEY_YELLOW] = "Yellow",
-	[KEY_BLUE] = "Blue",			[KEY_CHANNELUP] = "ChannelUp",
-	[KEY_CHANNELDOWN] = "ChannelDown",	[KEY_FIRST] = "First",
-	[KEY_LAST] = "Last",			[KEY_AB] = "AB",
-	[KEY_NEXT] = "Next",			[KEY_RESTART] = "Restart",
-	[KEY_SLOW] = "Slow",			[KEY_SHUFFLE] = "Shuffle",
-	[KEY_BREAK] = "Break",			[KEY_PREVIOUS] = "Previous",
-	[KEY_DIGITS] = "Digits",		[KEY_TEEN] = "TEEN",
-	[KEY_TWEN] = "TWEN",			[KEY_DEL_EOL] = "Delete EOL",
-	[KEY_DEL_EOS] = "Delete EOS",		[KEY_INS_LINE] = "Insert line",
-	[KEY_DEL_LINE] = "Delete line",
-	[KEY_NUMERIC_0] = "0",			[KEY_NUMERIC_1] = "1",
-	[KEY_NUMERIC_2] = "2",			[KEY_NUMERIC_3] = "3",
-	[KEY_NUMERIC_4] = "4",			[KEY_NUMERIC_5] = "5",
-	[KEY_NUMERIC_6] = "6",			[KEY_NUMERIC_7] = "7",
-	[KEY_NUMERIC_8] = "8",			[KEY_NUMERIC_9] = "9",
-};
-
-char *absval[5] = { "Value", "Min  ", "Max  ", "Fuzz ", "Flat " };
-
-char *relatives[REL_MAX + 1] = {
-	[0 ... REL_MAX] = NULL,
-	[REL_X] = "X",			[REL_Y] = "Y",
-	[REL_Z] = "Z",			[REL_HWHEEL] = "HWheel",
-	[REL_DIAL] = "Dial",		[REL_WHEEL] = "Wheel", 
-	[REL_MISC] = "Misc",	
-};
-
-char *absolutes[ABS_MAX + 1] = {
-	[0 ... ABS_MAX] = NULL,
-	[ABS_X] = "X",			[ABS_Y] = "Y",
-	[ABS_Z] = "Z",			[ABS_RX] = "Rx",
-	[ABS_RY] = "Ry",		[ABS_RZ] = "Rz",
-	[ABS_THROTTLE] = "Throttle",	[ABS_RUDDER] = "Rudder",
-	[ABS_WHEEL] = "Wheel",		[ABS_GAS] = "Gas",
-	[ABS_BRAKE] = "Brake",		[ABS_HAT0X] = "Hat0X",
-	[ABS_HAT0Y] = "Hat0Y",		[ABS_HAT1X] = "Hat1X",
-	[ABS_HAT1Y] = "Hat1Y",		[ABS_HAT2X] = "Hat2X",
-	[ABS_HAT2Y] = "Hat2Y",		[ABS_HAT3X] = "Hat3X",
-	[ABS_HAT3Y] = "Hat 3Y",		[ABS_PRESSURE] = "Pressure",
-	[ABS_DISTANCE] = "Distance",	[ABS_TILT_X] = "XTilt",
-	[ABS_TILT_Y] = "YTilt",		[ABS_TOOL_WIDTH] = "Tool Width",
-	[ABS_VOLUME] = "Volume",	[ABS_MISC] = "Misc",
-};
-
-char *misc[MSC_MAX + 1] = {
-	[ 0 ... MSC_MAX] = NULL,
-	[MSC_SERIAL] = "Serial",	[MSC_PULSELED] = "Pulseled",
-	[MSC_GESTURE] = "Gesture",	[MSC_RAW] = "RawData",
-	[MSC_SCAN] = "ScanCode",
-};
-
-char *leds[LED_MAX + 1] = {
-	[0 ... LED_MAX] = NULL,
-	[LED_NUML] = "NumLock",		[LED_CAPSL] = "CapsLock", 
-	[LED_SCROLLL] = "ScrollLock",	[LED_COMPOSE] = "Compose",
-	[LED_KANA] = "Kana",		[LED_SLEEP] = "Sleep", 
-	[LED_SUSPEND] = "Suspend",	[LED_MUTE] = "Mute",
-	[LED_MISC] = "Misc",
-};
-
-char *repeats[REP_MAX + 1] = {
-	[0 ... REP_MAX] = NULL,
-	[REP_DELAY] = "Delay",		[REP_PERIOD] = "Period"
-};
-
-char *sounds[SND_MAX + 1] = {
-	[0 ... SND_MAX] = NULL,
-	[SND_CLICK] = "Click",		[SND_BELL] = "Bell",
-	[SND_TONE] = "Tone"
-};
-
-char **names[EV_MAX + 1] = {
-	[0 ... EV_MAX] = NULL,
-	[EV_SYN] = events,			[EV_KEY] = keys,
-	[EV_REL] = relatives,			[EV_ABS] = absolutes,
-	[EV_MSC] = misc,			[EV_LED] = leds,
-	[EV_SND] = sounds,			[EV_REP] = repeats,
-};
-
-#define BITS_PER_LONG (sizeof(long) * 8)
-#define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1)
-#define OFF(x)  ((x)%BITS_PER_LONG)
-#define BIT(x)  (1UL<<OFF(x))
-#define LONG(x) ((x)/BITS_PER_LONG)
-#define test_bit(bit, array)	((array[LONG(bit)] >> OFF(bit)) & 1)
-
-int main (int argc, char **argv)
-{
-	int fd, rd, i, j, k;
-	struct input_event ev[64];
-	int version;
-	unsigned short id[4];
-	unsigned long bit[EV_MAX][NBITS(KEY_MAX)];
-	char name[256] = "Unknown";
-	int abs[5];
-
-	if (argc < 2) {
-		printf("Usage: evtest /dev/input/eventX\n");
-		printf("Where X = input device number\n");
-		return 1;
-	}
-
-	if ((fd = open(argv[argc - 1], O_RDONLY)) < 0) {
-		perror("evtest");
-		return 1;
-	}
-
-	if (ioctl(fd, EVIOCGVERSION, &version) < 0) {
-		perror("evtest: can't get version");
-		return 1;
-	}
-
-	printf("Input driver version is %d.%d.%d\n",
-		version >> 16, (version >> 8) & 0xff, version & 0xff);
-
-	ioctl(fd, EVIOCGID, id);
-	printf("Input device ID: bus 0x%x vendor 0x%x product 0x%x version 0x%x\n",
-		id[ID_BUS], id[ID_VENDOR], id[ID_PRODUCT], id[ID_VERSION]);
-
-	ioctl(fd, EVIOCGNAME(sizeof(name)), name);
-	printf("Input device name: \"%s\"\n", name);
-
-	memset(bit, 0, sizeof(bit));
-	ioctl(fd, EVIOCGBIT(0, sizeof(bit[0])), bit[0]);
-	printf("Supported events:\n");
-
-	for (i = 0; i < EV_MAX; i++)
-		if (test_bit(i, bit[0])) {
-			printf("  Event type %d (%s)\n", i, events[i] ? events[i] : "?");
-			if (!i) continue;
-			ioctl(fd, EVIOCGBIT(i, sizeof(bit[0])), bit[i]);
-			for (j = 0; j < KEY_MAX; j++) 
-				if (test_bit(j, bit[i])) {
-					printf("    Event code %d (%s)\n", j, names[i] ? (names[i][j] ? names[i][j] : "?") : "?");
-					if (i == EV_ABS) {
-						ioctl(fd, EVIOCGABS(j), abs);
-						for (k = 0; k < 5; k++)
-							if ((k < 3) || abs[k])
-								printf("      %s %6d\n", absval[k], abs[k]);
-					}
-				}
-		}
-		
-
-	printf("Testing ... (interrupt to exit)\n");
-
-	while (1) {
-		rd = read(fd, ev, sizeof(struct input_event) * 64);
-
-		if (rd < (int) sizeof(struct input_event)) {
-			printf("yyy\n");
-			perror("\nevtest: error reading");
-			return 1;
-		}
-
-		for (i = 0; i < rd / sizeof(struct input_event); i++)
-
-			if (ev[i].type == EV_SYN) {
-				printf("Event: time %ld.%06ld, -------------- %s ------------\n",
-					ev[i].time.tv_sec, ev[i].time.tv_usec, ev[i].code ? "Config Sync" : "Report Sync" );
-			} else if (ev[i].type == EV_MSC && (ev[i].code == MSC_RAW || ev[i].code == MSC_SCAN)) {
-				printf("Event: time %ld.%06ld, type %d (%s), code %d (%s), value %02x\n",
-					ev[i].time.tv_sec, ev[i].time.tv_usec, ev[i].type,
-					events[ev[i].type] ? events[ev[i].type] : "?",
-					ev[i].code,
-					names[ev[i].type] ? (names[ev[i].type][ev[i].code] ? names[ev[i].type][ev[i].code] : "?") : "?",
-					ev[i].value);
-			} else {
-				printf("Event: time %ld.%06ld, type %d (%s), code %d (%s), value %d\n",
-					ev[i].time.tv_sec, ev[i].time.tv_usec, ev[i].type,
-					events[ev[i].type] ? events[ev[i].type] : "?",
-					ev[i].code,
-					names[ev[i].type] ? (names[ev[i].type][ev[i].code] ? names[ev[i].type][ev[i].code] : "?") : "?",
-					ev[i].value);
-			}	
-
-		fflush(stdout);
-
-	}
-}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Linuxconsole-commit] SF.net SVN: linuxconsole:[2420] tags/release-1.4rc1/

From: <sk...@us...> - 2011-04-05 07:02:45

Revision: 2420
          http://linuxconsole.svn.sourceforge.net/linuxconsole/?rev=2420&view=rev
Author:   skitt
Date:     2011-04-05 07:02:39 +0000 (Tue, 05 Apr 2011)

Log Message:
-----------
Tagging the 1.4rc1 release.

Added Paths:
-----------
    tags/release-1.4rc1/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Linuxconsole-commit] SF.net SVN: linuxconsole:[2419] trunk/docs

From: <sk...@us...> - 2011-04-04 05:42:04

Revision: 2419
          http://linuxconsole.svn.sourceforge.net/linuxconsole/?rev=2419&view=rev
Author:   skitt
Date:     2011-04-04 05:41:58 +0000 (Mon, 04 Apr 2011)

Log Message:
-----------
Add manpages for jscal-restore and jscal-store.

Modified Paths:
--------------
    trunk/docs/Makefile

Added Paths:
-----------
    trunk/docs/jscal-restore.1
    trunk/docs/jscal-store.1

Modified: trunk/docs/Makefile
===================================================================
--- trunk/docs/Makefile	2011-04-04 05:41:32 UTC (rev 2418)
+++ trunk/docs/Makefile	2011-04-04 05:41:58 UTC (rev 2419)
@@ -20,7 +20,8 @@
 # 02110-1301 USA.
 
 MANPAGES	= evtest.1 inputattach.1 jstest.1 jscal.1 fftest.1 \
-		  ffmvforce.1 ffset.1 ffcfstress.1
+		  ffmvforce.1 ffset.1 ffcfstress.1 jscal-store.1 \
+		  jscal-restore.1
 
 PREFIX          ?= /usr/local
 

Added: trunk/docs/jscal-restore.1
===================================================================
--- trunk/docs/jscal-restore.1	                        (rev 0)
+++ trunk/docs/jscal-restore.1	2011-04-04 05:41:58 UTC (rev 2419)
@@ -0,0 +1,24 @@
+.TH jscal-restore 1 "April 7, 2010" jscal-restore
+.SH NAME
+jscal-restore \- restores joystick calibration
+.SH SYNOPSIS
+.BR jscal-restore
+.RI "<" device-name ">"
+.SH DESCRIPTION
+.B jscal-restore
+restores the calibration and mapping information for the given
+joystick device, previously stored by the
+.B jscal-store
+command.
+.PP
+On Debian systems any stored calibration settings are restored when
+the relevant device is connected, using udev.
+.SH FILES
+.TP
+/var/lib/joystick/joystick.state
+File used to store the calibration settings.
+.SH SEE ALSO
+\fBjscal\fP(1), \fBjscal-store\fP(1).
+.SH AUTHOR
+.B jscal-restore
+was written by Stephen Kitt.

Added: trunk/docs/jscal-store.1
===================================================================
--- trunk/docs/jscal-store.1	                        (rev 0)
+++ trunk/docs/jscal-store.1	2011-04-04 05:41:58 UTC (rev 2419)
@@ -0,0 +1,24 @@
+.TH jscal-store 1 "April 7, 2010" jscal-store
+.SH NAME
+jscal-store \- stores joystick calibration
+.SH SYNOPSIS
+.BR jscal-store
+.RI "<" device-name ">"
+.SH DESCRIPTION
+.B jscal-store
+stores the calibration and mapping information for the given joystick
+device. This information can later be restored using the
+.B jscal-restore
+command.
+.PP
+On Debian systems any stored calibration settings are restored when
+the relevant device is connected, using udev.
+.SH FILES
+.TP
+/var/lib/joystick/joystick.state
+File used to store the calibration settings.
+.SH SEE ALSO
+\fBjscal\fP(1), \fBjscal-restore\fP(1).
+.SH AUTHOR
+.B jscal-store
+was written by Stephen Kitt.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Linuxconsole-commit] SF.net SVN: linuxconsole:[2418] trunk/Makefile

From: <sk...@us...> - 2011-04-04 05:41:38

Revision: 2418
          http://linuxconsole.svn.sourceforge.net/linuxconsole/?rev=2418&view=rev
Author:   skitt
Date:     2011-04-04 05:41:32 +0000 (Mon, 04 Apr 2011)

Log Message:
-----------
Full Makefile for release.

Modified Paths:
--------------
    trunk/Makefile

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2011-04-03 22:03:17 UTC (rev 2417)
+++ trunk/Makefile	2011-04-04 05:41:32 UTC (rev 2418)
@@ -19,5 +19,24 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301 USA.
 
-%:
+VERSION := 1.4rc1
+
+PACKAGE := linuxconsoletools-$(VERSION)
+
+all: compile
+
+clean distclean compile:
 	$(MAKE) -C utils $@
+
+install:
+	$(MAKE) -C utils $@
+	$(MAKE) -C docs $@
+
+dist: clean
+	rm -rf $(PACKAGE)
+	mkdir $(PACKAGE)
+	cp -a docs utils COPYING Makefile NEWS README $(PACKAGE)
+	(cd $(PACKAGE); find . -name .svn -o -name *~ | xargs rm -rf; rm docs/FB-Driver-HOWTO docs/console.txt)
+	tar cjf $(PACKAGE).tar.bz2 $(PACKAGE)
+
+.PHONY: all clean distclean compile install dist


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Linuxconsole-commit] SF.net SVN: linuxconsole:[2417] trunk/utils/remove-obsolete-files

From: <sk...@us...> - 2011-04-03 22:03:23

Revision: 2417
          http://linuxconsole.svn.sourceforge.net/linuxconsole/?rev=2417&view=rev
Author:   skitt
Date:     2011-04-03 22:03:17 +0000 (Sun, 03 Apr 2011)

Log Message:
-----------
Drop obsolete file (!).

Removed Paths:
-------------
    trunk/utils/remove-obsolete-files

Deleted: trunk/utils/remove-obsolete-files
===================================================================
--- trunk/utils/remove-obsolete-files	2011-04-03 21:58:49 UTC (rev 2416)
+++ trunk/utils/remove-obsolete-files	2011-04-03 22:03:17 UTC (rev 2417)
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-rm -fv arch/m68k/hp300/hp300map.map
-rm -rf drivers/acorn/char/defkeymap-l7200.c
-rm -fv drivers/char/ec3104_keyb.c
-rm -fv drivers/tc/lk201.c
-rm -fv drivers/tc/lk201-remap.c
-rm -rf drivers/tc/lk201-map.map
-rm -fv include/asm-m68k/atari_joystick.h
-rm -fv include/asm-m68k/mac_mouse.h
-rm -fv include/asm-m68k/atarikb.h
-rm -fv include/linux/console_struct.h


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Linuxconsole-commit] SF.net SVN: linuxconsole:[2416] trunk

From: <sk...@us...> - 2011-04-03 21:58:55

Revision: 2416
          http://linuxconsole.svn.sourceforge.net/linuxconsole/?rev=2416&view=rev
Author:   skitt
Date:     2011-04-03 21:58:49 +0000 (Sun, 03 Apr 2011)

Log Message:
-----------
Add Makefile for the manpages.
Clean up extraneous space at the end of utils Makefile.

Modified Paths:
--------------
    trunk/utils/Makefile

Added Paths:
-----------
    trunk/docs/Makefile

Added: trunk/docs/Makefile
===================================================================
--- trunk/docs/Makefile	                        (rev 0)
+++ trunk/docs/Makefile	2011-04-03 21:58:49 UTC (rev 2416)
@@ -0,0 +1,31 @@
+# $Id: Makefile 2413 2011-04-03 17:24:32Z skitt $
+#
+# Makefile for Linux input utilities
+#
+# © 2011 Stephen Kitt <st...@sk...>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA.
+
+MANPAGES	= evtest.1 inputattach.1 jstest.1 jscal.1 fftest.1 \
+		  ffmvforce.1 ffset.1 ffcfstress.1
+
+PREFIX          ?= /usr/local
+
+install:
+	install -d $(DESTDIR)$(PREFIX)/share/man/man1
+	install $(MANPAGES) $(DESTDIR)$(PREFIX)/share/man/man1
+
+.PHONY: install

Modified: trunk/utils/Makefile
===================================================================
--- trunk/utils/Makefile	2011-04-03 21:43:00 UTC (rev 2415)
+++ trunk/utils/Makefile	2011-04-03 21:58:49 UTC (rev 2416)
@@ -75,4 +75,3 @@
 	install extract filter ident $(DESTDIR)$(PREFIX)/share/joystick
 
 .PHONY: compile clean distclean install
- 
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Linuxconsole-commit] SF.net SVN: linuxconsole:[2415] trunk/NEWS

From: <sk...@us...> - 2011-04-03 21:43:06

Revision: 2415
          http://linuxconsole.svn.sourceforge.net/linuxconsole/?rev=2415&view=rev
Author:   skitt
Date:     2011-04-03 21:43:00 +0000 (Sun, 03 Apr 2011)

Log Message:
-----------
NEWS file describing the changes since 200510109 and 1.2.15.

Added Paths:
-----------
    trunk/NEWS

Added: trunk/NEWS
===================================================================
--- trunk/NEWS	                        (rev 0)
+++ trunk/NEWS	2011-04-03 21:43:00 UTC (rev 2415)
@@ -0,0 +1,40 @@
+Version 1.4rc1
+--------------
+
+The following user-visible changes have been made since the last
+commonly used snapshot (20051019):
+
+* inputattach has been cleaned up, and now supports the following new
+  devices:
+  - Sahara Touch-iT213
+  - PS/2 multiplexers on TQM85xx boards
+  - Zhen Hua PCM-4CH RC transmitters
+  - TAOS evaluation modules
+  - Wacom W8001
+  - Microtouch, Touchright, Touchwindow, Penmount and Fujitsu
+    touchscreens
+
+* jscal tolerates greater jitter (so joysticks which don't send stable
+  values can still be calibrated).
+
+* jscal supports axis and button remapping.
+
+* Various USB devices which caused jscal and/or jstest to segfault are
+  now handled correctly.
+
+* jscal-store and jscal-restore allow joystick calibration and
+  remapping settings to be stored and restored.
+
+* Documentation is provided, with manpages for all the provided
+  utilities and sample udev rules.
+
+In addition, the 20051019 snapshot included the following user-visible
+changes since version 1.2.15:
+
+* jstest includes axis and button names.
+
+* New utilities:
+  - inputattach connects devices to the input layer, allowing them to
+    be used even if they are not directly supported;
+  - force-feedback utilities;
+  - evtest event-layer monitoring utility.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Linuxconsole-commit] SF.net SVN: linuxconsole:[2414] trunk

From: <sk...@us...> - 2011-04-03 21:32:18

Revision: 2414
          http://linuxconsole.svn.sourceforge.net/linuxconsole/?rev=2414&view=rev
Author:   skitt
Date:     2011-04-03 21:32:12 +0000 (Sun, 03 Apr 2011)

Log Message:
-----------
Describe the installation process.
Drop mentions of acceltest and GPL-1.
Credit Jean Delvare for his improvements to inputattach.
Add distclean target.
Make the install target create the bin directory.
Add top-level Makefile.

Modified Paths:
--------------
    trunk/README
    trunk/utils/Makefile

Added Paths:
-----------
    trunk/Makefile

Added: trunk/Makefile
===================================================================
--- trunk/Makefile	                        (rev 0)
+++ trunk/Makefile	2011-04-03 21:32:12 UTC (rev 2414)
@@ -0,0 +1,23 @@
+# $Id: Makefile 2413 2011-04-03 17:24:32Z skitt $
+#
+# Makefile for Linux input utilities
+#
+# © 2011 Stephen Kitt <st...@sk...>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA.
+
+%:
+	$(MAKE) -C utils $@

Modified: trunk/README
===================================================================
--- trunk/README	2011-04-03 17:24:32 UTC (rev 2413)
+++ trunk/README	2011-04-03 21:32:12 UTC (rev 2414)
@@ -34,6 +34,20 @@
 4. Store the device's setup using jscal-store.
 
 
+Installation
+------------
+
+To install the utilities and their manpages, run
+	make install
+from the distribution's top directory. This will install everything
+into /usr/local. Should you wish to install the tools elsewhere, you
+can use the PREFIX variable:
+	PREFIX=/usr make install
+The Makefiles also recognise the DESTDIR variable which can be used to
+install into a temporary directory (this is useful mainly for
+distribution packagers).
+
+
 Auto-loading inputattach and jscal-restore
 ------------------------------------------
 
@@ -102,6 +116,7 @@
 * Alexander Clouter: W8001 support.
 * Roberto Neri: much discussion, and fixes and improvements to
   jscal-store/jscal-restore and the udev rules given above.
+* Jean Delvare: inputattach improvements, TAOS support.
 
 
 License
@@ -119,8 +134,7 @@
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or (at
-your option) any later version. (acceltest.c is provided only under
-the terms of version 1 of the License.)
+your option) any later version.
 
 This program is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -133,5 +147,5 @@
 USA.
 
 
-The GNU General Public License version 1 is provided in the COPYING-1
-file; version 2 is provided in the COPYING file.
+The GNU General Public License version 2 is provided in the COPYING
+file.

Modified: trunk/utils/Makefile
===================================================================
--- trunk/utils/Makefile	2011-04-03 17:24:32 UTC (rev 2413)
+++ trunk/utils/Makefile	2011-04-03 21:32:12 UTC (rev 2414)
@@ -35,6 +35,7 @@
 
 compile: $(PROGRAMS)
 
+distclean: clean
 clean:
 	$(RM) *.o *.swp $(PROGRAMS) *.orig *.rej map *~
 
@@ -68,8 +69,10 @@
 	sed "s^@@PREFIX@@^$(PREFIX)^g" < $^ > $@
 
 install: compile
+	install -d $(DESTDIR)$(PREFIX)/bin
 	install $(PROGRAMS) $(DESTDIR)$(PREFIX)/bin
 	install -d $(DESTDIR)$(PREFIX)/share/joystick
 	install extract filter ident $(DESTDIR)$(PREFIX)/share/joystick
 
-.PHONY: compile clean install
+.PHONY: compile clean distclean install
+ 
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Linuxconsole-commit] SF.net SVN: linuxconsole:[2413] trunk/utils

From: <sk...@us...> - 2011-04-03 17:24:38

Revision: 2413
          http://linuxconsole.svn.sourceforge.net/linuxconsole/?rev=2413&view=rev
Author:   skitt
Date:     2011-04-03 17:24:32 +0000 (Sun, 03 Apr 2011)

Log Message:
-----------
Drop acceltest.c, it tests framebuffer functions which are no longer available.

Modified Paths:
--------------
    trunk/utils/Makefile

Removed Paths:
-------------
    trunk/utils/acceltest.c

Modified: trunk/utils/Makefile
===================================================================
--- trunk/utils/Makefile	2011-04-02 12:45:20 UTC (rev 2412)
+++ trunk/utils/Makefile	2011-04-03 17:24:32 UTC (rev 2413)
@@ -29,7 +29,7 @@
 CFLAGS		= -g -O2 -Wall -I../linux/include
 
 PROGRAMS	= evtest inputattach jstest jscal fftest ffmvforce ffset \
-		  ffcfstress jscal-restore jscal-store # acceltest
+		  ffcfstress jscal-restore jscal-store
 
 PREFIX          ?= /usr/local
 
@@ -61,9 +61,6 @@
 gencodes: gencodes.c scancodes.h
 	$(CC) $(CFLAGS) $(CPPFLAGS) gencodes.c -o gencodes
 
-acceltest: acceltest.c
-	$(CC) $(CFLAGS) $(CPPFLAGS) $^ -lm -o $@
-
 jscal-restore: jscal-restore.in
 	sed "s^@@PREFIX@@^$(PREFIX)^g" < $^ > $@
 

Deleted: trunk/utils/acceltest.c
===================================================================
--- trunk/utils/acceltest.c	2011-04-02 12:45:20 UTC (rev 2412)
+++ trunk/utils/acceltest.c	2011-04-03 17:24:32 UTC (rev 2413)
@@ -1,170 +0,0 @@
-/* $Header$ */
-/*
- * Copyright (C) 2001 Romain Dolbeau <do...@ir...>
- *
- *  This file is subject to the terms and conditions of the GNU General Public
- *  License. See the file COPYING in the main directory of this archive for
- *  more details.
- *
- */
-
-#include <stdio.h>
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-extern char *optarg;
-extern int optind, opterr, optopt;
-
-#include <errno.h>
-int errno;
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <setjmp.h>
-#include <sys/mman.h>
-#include <asm/page.h>
-#include <asm/byteorder.h>
-
-#include <linux/fb.h>
-#include <linux/fbvid.h>
-
-
-
-int
-main(int argc, char **argv)
-{
-	char fbdevice[256];
-	int fbnum = 0, opnu = 0, sx = 128, sy = 128, wi = 64, he = 64, color = 0xFFFFFFFF, nsx, nsy, count = 0;
-	unsigned char *fb_mem = NULL;
-	int fb_mem_offset = 0, fbd, r;
-	char *tmpoptarg;
-	struct fb_var_screeninfo fb_var;
-	struct fb_fix_screeninfo fb_fix;
-	struct fb_fillrect fbfr;
-	struct fb_copyarea fbca;
-	
-	while ((opnu = getopt(argc, argv, "f:x:y:w:h:c:?")) != EOF)
-	{
-		switch(opnu)
-		{
-		case 'f':
-			tmpoptarg = optarg;
-			if (!(strncmp(tmpoptarg, "/dev/", 5)))
-				tmpoptarg += 5;
-			if (!(strncmp(tmpoptarg, "fb", 2)))
-				tmpoptarg += 2;
-			fbnum = atoi(tmpoptarg);
-			break;
-		case 'x':
-			sx = atoi(optarg);
-			break;
-		case 'y':
-			sy = atoi(optarg);
-			break;
-		case 'w':
-			wi = atoi(optarg);
-			break;
-		case 'h':
-			he = atoi(optarg);
-			break;
-		case 'c':
-			color = atoi(optarg);
-			break;
-		case '?':
-			printf("Usage: %s [-f <fb_device>] [-x <initial_X>] [-y <initial_Y>] [-w <width>] [-h <height>] [-c <colour>]\n", argv[0]);
-			return(0);
-		default:
-			fprintf(stderr, "Warning: Unknown option \"%c\", try %s -?\n", opnu, argv[0]);
-			exit(1);
-		}
-	}
-
-	fprintf(stderr, "Opening /dev/fb%d\n", fbnum);
-	
-	sprintf(fbdevice, "/dev/fb%d", fbnum);
-	fbd = open(fbdevice, O_RDWR);
-	
-	if (fbd < 0)
-	{
-		fprintf(stderr, "Couldn't open /dev/fb%d; errno: %d (%s)\n", fbnum, errno, strerror(errno));
-		exit(1);
-	}
-	r = ioctl(fbd, FBIOGET_VSCREENINFO, &fb_var);
-	if (r < 0)
-	{
-		fprintf(stderr, "IOCTL FBIOGET_VSCREENINFO error: %d errno: %d (%s)\n", r, errno, strerror(errno));
-		exit(1);
-	}
-	r = ioctl(fbd, FBIOGET_FSCREENINFO, &fb_fix);
-	if (r < 0)
-	{
-		fprintf(stderr, "IOCTL FBIOGET_FSCREENINFO error: %d errno: %d (%s)\n", r, errno, strerror(errno));
-		exit(1);
-	}
-	/* map all FB memory */
-	fb_mem_offset = (unsigned long)(fb_fix.smem_start) & (~PAGE_MASK);
-	fb_mem = mmap(NULL,fb_fix.smem_len+fb_mem_offset,PROT_WRITE,MAP_SHARED,fbd,0);
-	if (!fb_mem)
-	{
-		fprintf(stderr, "MMap of /dev/fb%d failed\n", fbnum);
-		exit(1);
-	}
-	if (((sx + wi) > fb_var.xres) || ((sy + he) > fb_var.yres))
-	{
-		fprintf(stderr, "Rectangle too big for given offset (%dx%d+%d+%d, fb is %dx%d)",
-			he, wi, sx, sy,
-			fb_var.xres, fb_var.xres);
-		exit(1);
-	}
-	fprintf(stderr, "Filling rect with color 0x%x\n", color);
-	fbfr.dx = sx;
-	fbfr.dy = sy;
-	fbfr.width = wi;
-	fbfr.height = he;
-	fbfr.color = color;
-	fbfr.rop = ROP_COPY;
-	r = ioctl(fbd, FBIOPUT_FILLRECT, &fbfr);
-	if (r < 0)
-	{
-		fprintf(stderr, "IOCTL FBIOPUT_FILLRECT error: %d errno: %d (%s)\n", r, errno, strerror(errno));
-		exit(1);
-	}
-	if ((sx == 0) || (sy == 0))
-	{
-		fprintf(stderr, "Can't CopyArea, stop\n");
-		return(0);
-	}	
-	nsx = sx; nsy = sy;
-	fbca.width = wi + 1;
-	fbca.height = he + 1;
-	while (((nsx + wi) < fb_var.xres) ||
-	       ((nsy + he) < fb_var.yres))
-	{
-		count++;
-		if ((nsx + wi) < fb_var.xres)
-		{
-			sx = nsx;
-			nsx++;
-		}
-		if ((nsy + he) < fb_var.yres)
-		{
-			sy = nsy;
-			nsy++;
-		}
-		fbca.sx = sx - 1;
-		fbca.sy = sy - 1;
-		fbca.dx = nsx;
-		fbca.dy = nsy;
-		r = ioctl(fbd, FBIOPUT_COPYAREA, &fbca);
-		if (r < 0)
-		{
-			fprintf(stderr, "IOCTL FBIOPUT_FILLRECT #%d error: %d errno: %d (%s)\n",
-				count, r, errno, strerror(errno));
-			exit(1);
-		}
-	}
-	return(0);
-}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Linuxconsole-commit] SF.net SVN: linuxconsole:[2412] trunk/utils

From: <sk...@us...> - 2011-04-02 12:45:26

Revision: 2412
          http://linuxconsole.svn.sourceforge.net/linuxconsole/?rev=2412&view=rev
Author:   skitt
Date:     2011-04-02 12:45:20 +0000 (Sat, 02 Apr 2011)

Log Message:
-----------
Update FSF address and remove obsolete contact info.

Modified Paths:
--------------
    trunk/utils/Makefile
    trunk/utils/evtest.c
    trunk/utils/ffcfstress.c
    trunk/utils/ffmvforce.c
    trunk/utils/ffset.c
    trunk/utils/fftest.c
    trunk/utils/inputattach.c
    trunk/utils/jscal.c
    trunk/utils/jstest.c
    trunk/utils/scancodes.h

Modified: trunk/utils/Makefile
===================================================================
--- trunk/utils/Makefile	2011-03-30 22:15:29 UTC (rev 2411)
+++ trunk/utils/Makefile	2011-04-02 12:45:20 UTC (rev 2412)
@@ -3,10 +3,9 @@
 #
 # Makefile for Linux input utilities
 #
-# (c) 1998-2000 Vojtech Pavlik
+# © 1998-2000 Vojtech Pavlik (sponsored by SuSE)
+# © 2008-2011 Stephen Kitt <st...@sk...>
 #
-# Sponsored by SuSE
-#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
@@ -19,13 +18,10 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA.
 #
-# Should you need to contact me, the author, you can do so either by
-# e-mail - mail your message to <vo...@uc...>, or by paper mail:
-# Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic
 #
-#
 # Edit the options below to suit your needs
 #
 

Modified: trunk/utils/evtest.c
===================================================================
--- trunk/utils/evtest.c	2011-03-30 22:15:29 UTC (rev 2411)
+++ trunk/utils/evtest.c	2011-04-02 12:45:20 UTC (rev 2412)
@@ -19,11 +19,8 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- * 
- * Should you need to contact me, the author, you can do so either by
- * e-mail - mail your message to <vo...@uc...>, or by paper mail:
- * Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
  */
 
 #include <stdint.h>

Modified: trunk/utils/ffcfstress.c
===================================================================
--- trunk/utils/ffcfstress.c	2011-03-30 22:15:29 UTC (rev 2411)
+++ trunk/utils/ffcfstress.c	2011-04-02 12:45:20 UTC (rev 2412)
@@ -17,7 +17,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
  */
 
 #include <linux/input.h>

Modified: trunk/utils/ffmvforce.c
===================================================================
--- trunk/utils/ffmvforce.c	2011-03-30 22:15:29 UTC (rev 2411)
+++ trunk/utils/ffmvforce.c	2011-04-02 12:45:20 UTC (rev 2412)
@@ -19,7 +19,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
  *
  * You can contact the author by email at this address:
  * Johann Deneux <de...@if...>

Modified: trunk/utils/ffset.c
===================================================================
--- trunk/utils/ffset.c	2011-03-30 22:15:29 UTC (rev 2411)
+++ trunk/utils/ffset.c	2011-04-02 12:45:20 UTC (rev 2412)
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
  *
  * You can contact the author by email at this address:
  * Johann Deneux <de...@if...>

Modified: trunk/utils/fftest.c
===================================================================
--- trunk/utils/fftest.c	2011-03-30 22:15:29 UTC (rev 2411)
+++ trunk/utils/fftest.c	2011-04-02 12:45:20 UTC (rev 2412)
@@ -18,7 +18,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
  *
  * You can contact the author by email at this address:
  * Johann Deneux <de...@if...>

Modified: trunk/utils/inputattach.c
===================================================================
--- trunk/utils/inputattach.c	2011-03-30 22:15:29 UTC (rev 2411)
+++ trunk/utils/inputattach.c	2011-04-02 12:45:20 UTC (rev 2412)
@@ -28,11 +28,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Should you need to contact me, the author, you can do so either by
- * e-mail - mail your message to <vo...@uc...>, or by paper mail:
- * Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
  */
 
 #include <ctype.h>

Modified: trunk/utils/jscal.c
===================================================================
--- trunk/utils/jscal.c	2011-03-30 22:15:29 UTC (rev 2411)
+++ trunk/utils/jscal.c	2011-04-02 12:45:20 UTC (rev 2412)
@@ -23,11 +23,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Should you need to contact me, the author, you can do so either by
- * e-mail - mail your message to <vo...@uc...>, or by paper mail:
- * Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
  */
 
 #include <sys/ioctl.h>

Modified: trunk/utils/jstest.c
===================================================================
--- trunk/utils/jstest.c	2011-03-30 22:15:29 UTC (rev 2411)
+++ trunk/utils/jstest.c	2011-04-02 12:45:20 UTC (rev 2412)
@@ -27,11 +27,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Should you need to contact me, the author, you can do so either by
- * e-mail - mail your message to <vo...@uc...>, or by paper mail:
- * Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
  */
 
 #include <sys/ioctl.h>

Modified: trunk/utils/scancodes.h
===================================================================
--- trunk/utils/scancodes.h	2011-03-30 22:15:29 UTC (rev 2411)
+++ trunk/utils/scancodes.h	2011-04-02 12:45:20 UTC (rev 2412)
@@ -17,11 +17,8 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- * 
- * Should you need to contact me, the author, you can do so either by
- * e-mail - mail your message to <vo...@uc...>, or by paper mail:
- * Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
  */
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Linuxconsole-commit] SF.net SVN: linuxconsole:[2411] trunk

From: <sk...@us...> - 2011-03-30 22:15:35

Revision: 2411
          http://linuxconsole.svn.sourceforge.net/linuxconsole/?rev=2411&view=rev
Author:   skitt
Date:     2011-03-30 22:15:29 +0000 (Wed, 30 Mar 2011)

Log Message:
-----------
Add support for the TAOS evaluation modules (driver i2c-taos-evm).

Signed-off-by: Jean Delvare <jde...@su...>

Modified Paths:
--------------
    trunk/docs/inputattach.1
    trunk/utils/inputattach.c

Modified: trunk/docs/inputattach.1
===================================================================
--- trunk/docs/inputattach.1	2011-03-30 21:30:19 UTC (rev 2410)
+++ trunk/docs/inputattach.1	2011-03-30 22:15:29 UTC (rev 2411)
@@ -104,6 +104,9 @@
 .BR \-sun ", " \-\-sunmouse
 3-button Sun mouse 
 .TP
+.BR \-taos ", " \-\-taos\-evm
+TAOS evaluation module
+.TP
 .BR \-t213 ", " \-\-touchit213
 Sahara Touch-iT213 Tablet PC 
 .TP

Modified: trunk/utils/inputattach.c
===================================================================
--- trunk/utils/inputattach.c	2011-03-30 21:30:19 UTC (rev 2410)
+++ trunk/utils/inputattach.c	2011-03-30 22:15:29 UTC (rev 2411)
@@ -580,6 +580,11 @@
 { "--zhen-hua",		"-zhen",	"Zhen Hua 5-byte protocol",
 	B19200, CS8,
 	SERIO_ZHENHUA,		0x00,	0x00,	0,	zhenhua_init },
+#ifdef SERIO_TAOSEVM
+{ "--taos-evm",		"-taos",	"TAOS evaluation module",
+	B1200, CS8,
+	SERIO_TAOSEVM,		0,	0,	0,	NULL },
+#endif
 { "--dump",		"-dump",	"Just enable device",
 	B2400, CS8,
 	0,			0x00,	0x00,	0,	dump_init },


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

5 messages has been excluded from this view by a project administrator.

Flat | Threaded

1 2 3 .. 69 > >> (Page 1 of 69)