frame

Merge lp:~oif-packaging/frame/ubuntu.v1.1.2 into lp:frame/ubuntu

  1. ubuntu.v1.1.2
  2. Merge into ubuntu
Proposed by Henrik Rydberg
Status: Merged
Merged at revision: 24
Proposed branch: lp:~oif-packaging/frame/ubuntu.v1.1.2
Merge into: lp:frame/ubuntu
Diff against target: 509 lines (+159/-53)
8 files modified
ChangeLog (+33/-0)
configure (+56/-28)
configure.ac (+7/-3)
debian/changelog (+8/-0)
debian/control (+1/-1)
tools/utouch-frame-test-mtdev.1 (+2/-2)
tools/utouch-frame-test-mtdev.c (+50/-17)
tools/utouch-frame-test-xi2.1 (+2/-2)
To merge this branch: bzr merge lp:~oif-packaging/frame/ubuntu.v1.1.2
Reviewer Review Type Date Requested Status
Chase Douglas (community) Approve
Henrik Rydberg (community) Approve
Review via email: mp+53505@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Henrik Rydberg (rydberg) wrote :

Packaging for the evemu replay feature in utouch-frame-test-mtdev.

Revision history for this message
Henrik Rydberg (rydberg) wrote :

Added an xi-enabled version in the utouch unstable ppa. Test tool: utouch-frame-test-xi2

Revision history for this message
Henrik Rydberg (rydberg) wrote :

This branch was approved, merged and released already.

review: Approve
Revision history for this message
Henrik Rydberg (rydberg) wrote :

No it is not, sorry about that.

Revision history for this message
Henrik Rydberg (rydberg) wrote :

It seems the FFe has been approved, so a review of this branch and subsequent upload before adding more new stuff seems like a good idea.

Revision history for this message
Chase Douglas (chasedouglas) wrote :

Looks good to me. I think we should aim for oneiric with this though, so lets merge it and get it into a daily build. We can do an upstream release when we want to too.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog'
2--- ChangeLog 2011-02-24 15:01:51 +0000
3+++ ChangeLog 2011-03-16 07:08:31 +0000
4@@ -1,4 +1,37 @@
5 ------------------------------------------------------------
6+revno: 29
7+tags: v1.1.2
8+committer: Henrik Rydberg <rydberg@bitmath.org>
9+branch nick: trunk
10+timestamp: Tue 2011-03-15 20:15:23 +0100
11+message:
12+ Release version 1.1.2
13+
14+ Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
15+------------------------------------------------------------
16+revno: 28
17+committer: Henrik Rydberg <rydberg@bitmath.org>
18+branch nick: trunk
19+timestamp: Tue 2011-03-15 20:15:17 +0100
20+message:
21+ Allow replay of device data through utouch-frame
22+
23+ This patch adds replay capabilities to test-mtdev.
24+ If the specified device points to a valid evemu file,
25+ the device properties will be extracted from that file
26+ instead. Any appended event data will be replayed in
27+ realtime. In practise, test-mtdev can be executed with
28+ a test file.
29+
30+ Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
31+------------------------------------------------------------
32+revno: 27 [merge]
33+committer: Stephen M. Webb <stephen.webb@canonical.com>
34+branch nick: utouch-frame
35+timestamp: Tue 2011-03-15 15:04:33 -0400
36+message:
37+ Added a dependency check on xorg-server-dev when building with xi2 support.
38+------------------------------------------------------------
39 revno: 26
40 tags: v1.1.1
41 committer: Henrik Rydberg <rydberg@bitmath.org>
42
43=== modified file 'configure'
44--- configure 2011-02-24 15:03:01 +0000
45+++ configure 2011-03-16 07:08:31 +0000
46@@ -1,6 +1,6 @@
47 #! /bin/sh
48 # Guess values for system-dependent variables and create Makefiles.
49-# Generated by GNU Autoconf 2.67 for Touch Frame Library 1.1.1.
50+# Generated by GNU Autoconf 2.67 for Touch Frame Library 1.1.2.
51 #
52 #
53 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
54@@ -698,8 +698,8 @@
55 # Identity of this package.
56 PACKAGE_NAME='Touch Frame Library'
57 PACKAGE_TARNAME='utouch-frame'
58-PACKAGE_VERSION='1.1.1'
59-PACKAGE_STRING='Touch Frame Library 1.1.1'
60+PACKAGE_VERSION='1.1.2'
61+PACKAGE_STRING='Touch Frame Library 1.1.2'
62 PACKAGE_BUGREPORT=''
63 PACKAGE_URL=''
64
65@@ -1440,7 +1440,7 @@
66 # Omit some internal or obsolete options to make the list less imposing.
67 # This message is too long to be a string in the A/UX 3.1 sh.
68 cat <<_ACEOF
69-\`configure' configures Touch Frame Library 1.1.1 to adapt to many kinds of systems.
70+\`configure' configures Touch Frame Library 1.1.2 to adapt to many kinds of systems.
71
72 Usage: $0 [OPTION]... [VAR=VALUE]...
73
74@@ -1510,7 +1510,7 @@
75
76 if test -n "$ac_init_help"; then
77 case $ac_init_help in
78- short | recursive ) echo "Configuration of Touch Frame Library 1.1.1:";;
79+ short | recursive ) echo "Configuration of Touch Frame Library 1.1.2:";;
80 esac
81 cat <<\_ACEOF
82
83@@ -1626,7 +1626,7 @@
84 test -n "$ac_init_help" && exit $ac_status
85 if $ac_init_version; then
86 cat <<\_ACEOF
87-Touch Frame Library configure 1.1.1
88+Touch Frame Library configure 1.1.2
89 generated by GNU Autoconf 2.67
90
91 Copyright (C) 2010 Free Software Foundation, Inc.
92@@ -1904,7 +1904,7 @@
93 This file contains any messages produced by compilers while
94 running configure, to aid debugging if configure makes a mistake.
95
96-It was created by Touch Frame Library $as_me 1.1.1, which was
97+It was created by Touch Frame Library $as_me 1.1.2, which was
98 generated by GNU Autoconf 2.67. Invocation command line was
99
100 $ $0 $@
101@@ -2724,7 +2724,7 @@
102
103 # Define the identity of the package.
104 PACKAGE='utouch-frame'
105- VERSION='1.1.1'
106+ VERSION='1.1.2'
107
108
109 cat >>confdefs.h <<_ACEOF
110@@ -11282,12 +11282,12 @@
111 pkg_cv_EVEMU_CFLAGS="$EVEMU_CFLAGS"
112 elif test -n "$PKG_CONFIG"; then
113 if test -n "$PKG_CONFIG" && \
114- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"utouch-evemu >= 1.0\""; } >&5
115- ($PKG_CONFIG --exists --print-errors "utouch-evemu >= 1.0") 2>&5
116+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"utouch-evemu >= 1.0.5\""; } >&5
117+ ($PKG_CONFIG --exists --print-errors "utouch-evemu >= 1.0.5") 2>&5
118 ac_status=$?
119 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
120 test $ac_status = 0; }; then
121- pkg_cv_EVEMU_CFLAGS=`$PKG_CONFIG --cflags "utouch-evemu >= 1.0" 2>/dev/null`
122+ pkg_cv_EVEMU_CFLAGS=`$PKG_CONFIG --cflags "utouch-evemu >= 1.0.5" 2>/dev/null`
123 else
124 pkg_failed=yes
125 fi
126@@ -11298,12 +11298,12 @@
127 pkg_cv_EVEMU_LIBS="$EVEMU_LIBS"
128 elif test -n "$PKG_CONFIG"; then
129 if test -n "$PKG_CONFIG" && \
130- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"utouch-evemu >= 1.0\""; } >&5
131- ($PKG_CONFIG --exists --print-errors "utouch-evemu >= 1.0") 2>&5
132+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"utouch-evemu >= 1.0.5\""; } >&5
133+ ($PKG_CONFIG --exists --print-errors "utouch-evemu >= 1.0.5") 2>&5
134 ac_status=$?
135 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
136 test $ac_status = 0; }; then
137- pkg_cv_EVEMU_LIBS=`$PKG_CONFIG --libs "utouch-evemu >= 1.0" 2>/dev/null`
138+ pkg_cv_EVEMU_LIBS=`$PKG_CONFIG --libs "utouch-evemu >= 1.0.5" 2>/dev/null`
139 else
140 pkg_failed=yes
141 fi
142@@ -11323,14 +11323,14 @@
143 _pkg_short_errors_supported=no
144 fi
145 if test $_pkg_short_errors_supported = yes; then
146- EVEMU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "utouch-evemu >= 1.0" 2>&1`
147+ EVEMU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "utouch-evemu >= 1.0.5" 2>&1`
148 else
149- EVEMU_PKG_ERRORS=`$PKG_CONFIG --print-errors "utouch-evemu >= 1.0" 2>&1`
150+ EVEMU_PKG_ERRORS=`$PKG_CONFIG --print-errors "utouch-evemu >= 1.0.5" 2>&1`
151 fi
152 # Put the nasty error message in config.log where it belongs
153 echo "$EVEMU_PKG_ERRORS" >&5
154
155- as_fn_error $? "Package requirements (utouch-evemu >= 1.0) were not met:
156+ as_fn_error $? "Package requirements (utouch-evemu >= 1.0.5) were not met:
157
158 $EVEMU_PKG_ERRORS
159
160@@ -11389,12 +11389,21 @@
161 pkg_cv_XINPUT_CFLAGS="$XINPUT_CFLAGS"
162 elif test -n "$PKG_CONFIG"; then
163 if test -n "$PKG_CONFIG" && \
164- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xext xi >= 1.4.1.99.1 inputproto >= 2.0.99.1\""; } >&5
165- ($PKG_CONFIG --exists --print-errors "x11 xext xi >= 1.4.1.99.1 inputproto >= 2.0.99.1") 2>&5
166+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xext
167+ xi >= 1.4.1.99.1
168+ inputproto >= 2.0.99.1
169+ xorg-server\""; } >&5
170+ ($PKG_CONFIG --exists --print-errors "x11 xext
171+ xi >= 1.4.1.99.1
172+ inputproto >= 2.0.99.1
173+ xorg-server") 2>&5
174 ac_status=$?
175 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
176 test $ac_status = 0; }; then
177- pkg_cv_XINPUT_CFLAGS=`$PKG_CONFIG --cflags "x11 xext xi >= 1.4.1.99.1 inputproto >= 2.0.99.1" 2>/dev/null`
178+ pkg_cv_XINPUT_CFLAGS=`$PKG_CONFIG --cflags "x11 xext
179+ xi >= 1.4.1.99.1
180+ inputproto >= 2.0.99.1
181+ xorg-server" 2>/dev/null`
182 else
183 pkg_failed=yes
184 fi
185@@ -11405,12 +11414,21 @@
186 pkg_cv_XINPUT_LIBS="$XINPUT_LIBS"
187 elif test -n "$PKG_CONFIG"; then
188 if test -n "$PKG_CONFIG" && \
189- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xext xi >= 1.4.1.99.1 inputproto >= 2.0.99.1\""; } >&5
190- ($PKG_CONFIG --exists --print-errors "x11 xext xi >= 1.4.1.99.1 inputproto >= 2.0.99.1") 2>&5
191+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xext
192+ xi >= 1.4.1.99.1
193+ inputproto >= 2.0.99.1
194+ xorg-server\""; } >&5
195+ ($PKG_CONFIG --exists --print-errors "x11 xext
196+ xi >= 1.4.1.99.1
197+ inputproto >= 2.0.99.1
198+ xorg-server") 2>&5
199 ac_status=$?
200 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
201 test $ac_status = 0; }; then
202- pkg_cv_XINPUT_LIBS=`$PKG_CONFIG --libs "x11 xext xi >= 1.4.1.99.1 inputproto >= 2.0.99.1" 2>/dev/null`
203+ pkg_cv_XINPUT_LIBS=`$PKG_CONFIG --libs "x11 xext
204+ xi >= 1.4.1.99.1
205+ inputproto >= 2.0.99.1
206+ xorg-server" 2>/dev/null`
207 else
208 pkg_failed=yes
209 fi
210@@ -11430,14 +11448,23 @@
211 _pkg_short_errors_supported=no
212 fi
213 if test $_pkg_short_errors_supported = yes; then
214- XINPUT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11 xext xi >= 1.4.1.99.1 inputproto >= 2.0.99.1" 2>&1`
215+ XINPUT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11 xext
216+ xi >= 1.4.1.99.1
217+ inputproto >= 2.0.99.1
218+ xorg-server" 2>&1`
219 else
220- XINPUT_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11 xext xi >= 1.4.1.99.1 inputproto >= 2.0.99.1" 2>&1`
221+ XINPUT_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11 xext
222+ xi >= 1.4.1.99.1
223+ inputproto >= 2.0.99.1
224+ xorg-server" 2>&1`
225 fi
226 # Put the nasty error message in config.log where it belongs
227 echo "$XINPUT_PKG_ERRORS" >&5
228
229- as_fn_error $? "Package requirements (x11 xext xi >= 1.4.1.99.1 inputproto >= 2.0.99.1) were not met:
230+ as_fn_error $? "Package requirements (x11 xext
231+ xi >= 1.4.1.99.1
232+ inputproto >= 2.0.99.1
233+ xorg-server) were not met:
234
235 $XINPUT_PKG_ERRORS
236
237@@ -11470,6 +11497,7 @@
238
239 fi
240
241+
242 fi
243
244 # Extract the first word of "a2x", so it can be a program name with args.
245@@ -12062,7 +12090,7 @@
246 # report actual input values of CONFIG_FILES etc. instead of their
247 # values after options handling.
248 ac_log="
249-This file was extended by Touch Frame Library $as_me 1.1.1, which was
250+This file was extended by Touch Frame Library $as_me 1.1.2, which was
251 generated by GNU Autoconf 2.67. Invocation command line was
252
253 CONFIG_FILES = $CONFIG_FILES
254@@ -12128,7 +12156,7 @@
255 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
256 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
257 ac_cs_version="\\
258-Touch Frame Library config.status 1.1.1
259+Touch Frame Library config.status 1.1.2
260 configured by $0, generated by GNU Autoconf 2.67,
261 with options \\"\$ac_cs_config\\"
262
263
264=== modified file 'configure.ac'
265--- configure.ac 2011-02-24 15:03:01 +0000
266+++ configure.ac 2011-03-16 07:08:31 +0000
267@@ -1,7 +1,7 @@
268 # Initialize Autoconf
269 AC_PREREQ([2.60])
270 AC_INIT([Touch Frame Library],
271- [1.1.1],
272+ [1.1.2],
273 [],
274 [utouch-frame])
275 AC_CONFIG_SRCDIR([Makefile.am])
276@@ -23,13 +23,17 @@
277 AC_PROG_INSTALL
278
279 PKG_CHECK_MODULES([MTDEV], [mtdev >= 1.1])
280-PKG_CHECK_MODULES([EVEMU], [utouch-evemu >= 1.0])
281+PKG_CHECK_MODULES([EVEMU], [utouch-evemu >= 1.0.5])
282
283 AC_ARG_WITH([xi], AS_HELP_STRING([--with-xi], [Build with XI2.1 support]))
284 AM_CONDITIONAL([HAVE_XI], [test "x$with_xi" != "x"])
285
286 AS_IF([test "x$with_xi" = "xyes"], [
287- PKG_CHECK_MODULES(XINPUT, x11 xext [xi >= 1.4.1.99.1] [inputproto >= 2.0.99.1])
288+ PKG_CHECK_MODULES(XINPUT, x11 xext
289+ [xi >= 1.4.1.99.1]
290+ [inputproto >= 2.0.99.1]
291+ [xorg-server])
292+
293 ])
294
295 AC_CHECK_PROG([ASCIIDOC], [a2x], [a2x])
296
297=== modified file 'debian/changelog'
298--- debian/changelog 2011-02-24 16:17:17 +0000
299+++ debian/changelog 2011-03-16 07:08:31 +0000
300@@ -1,3 +1,11 @@
301+utouch-frame (1.1.2-0ubuntu1) UNRELEASED; urgency=low
302+
303+ * New upstream release.
304+ * Feature freeze exception LP: #735672
305+ * Updated dependency evemu-1.0.5
306+
307+ -- Henrik Rydberg <rydberg@bitmath.org> Wed, 16 Mar 2011 08:08:58 +0100
308+
309 utouch-frame (1.1.1-0ubuntu1) natty; urgency=low
310
311 [ Henrik Rydberg ]
312
313=== modified file 'debian/control'
314--- debian/control 2011-02-18 14:37:53 +0000
315+++ debian/control 2011-03-16 07:08:31 +0000
316@@ -13,7 +13,7 @@
317 libtool,
318 cdbs,
319 libmtdev-dev (>= 1.1),
320- libutouch-evemu-dev (>= 1.0)
321+ libutouch-evemu-dev (>= 1.0.5)
322 Standards-Version: 3.9.1
323 Vcs-Bzr: https://code.launchpad.net/~utouch-packaging/utouch-frame/ubuntu
324
325
326=== modified file 'tools/utouch-frame-test-mtdev.1'
327--- tools/utouch-frame-test-mtdev.1 2011-02-24 15:01:51 +0000
328+++ tools/utouch-frame-test-mtdev.1 2011-03-16 07:08:31 +0000
329@@ -2,12 +2,12 @@
330 .\" Title: utouch-frame-test-mtdev
331 .\" Author: [see the "AUTHOR" section]
332 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
333-.\" Date: 02/24/2011
334+.\" Date: 03/15/2011
335 .\" Manual: \ \&
336 .\" Source: \ \&
337 .\" Language: English
338 .\"
339-.TH "UTOUCH\-FRAME\-TEST\" "1" "02/24/2011" "\ \&" "\ \&"
340+.TH "UTOUCH\-FRAME\-TEST\" "1" "03/15/2011" "\ \&" "\ \&"
341 .\" -----------------------------------------------------------------
342 .\" * Define some portability stuff
343 .\" -----------------------------------------------------------------
344
345=== modified file 'tools/utouch-frame-test-mtdev.c'
346--- tools/utouch-frame-test-mtdev.c 2011-02-23 10:25:28 +0000
347+++ tools/utouch-frame-test-mtdev.c 2011-03-16 07:08:31 +0000
348@@ -36,25 +36,32 @@
349 struct evemu_device *evemu;
350 struct mtdev *mtdev;
351 utouch_frame_handle fh;
352+ struct stat fs;
353+ FILE *fptest;
354+ int fd;
355 };
356
357-static int init_evemu(struct frame_test *test, int fd)
358+static int init_evemu(struct frame_test *test)
359 {
360 test->evemu = evemu_new(NULL);
361 if (!test->evemu)
362 return -1;
363- return evemu_extract(test->evemu, fd);
364+ if (test->fptest)
365+ return evemu_read(test->evemu, test->fptest) <= 0;
366+ return evemu_extract(test->evemu, test->fd);
367 }
368
369-static int init_mtdev(struct frame_test *test, int fd)
370+static int init_mtdev(struct frame_test *test)
371 {
372- test->mtdev = mtdev_new_open(fd);
373+ if (test->fptest)
374+ return 0;
375+ test->mtdev = mtdev_new_open(test->fd);
376 if (!test->mtdev)
377 return -1;
378 return 0;
379 }
380
381-static int init_frame(struct frame_test *test, int fd)
382+static int init_frame(struct frame_test *test)
383 {
384 test->fh = utouch_frame_new_engine(100, 32, 100);
385 if (!test->fh)
386@@ -65,46 +72,71 @@
387 static void destroy_all(struct frame_test *test)
388 {
389 utouch_frame_delete_engine(test->fh);
390- mtdev_close_delete(test->mtdev);
391+ if (test->mtdev)
392+ mtdev_close_delete(test->mtdev);
393 evemu_delete(test->evemu);
394+ if (test->fptest)
395+ fclose(test->fptest);
396+ else
397+ ioctl(test->fd, EVIOCGRAB, 0);
398+ close(test->fd);
399 memset(test, 0, sizeof(*test));
400 }
401
402-static void loop_device(struct frame_test *test, int fd)
403+static void loop_device(struct frame_test *test)
404 {
405+ FILE * fp = test->fptest;
406 const struct utouch_frame *frame;
407 struct input_event ev;
408
409- while (!mtdev_idle(test->mtdev, fd, 5000)) {
410- while (mtdev_get(test->mtdev, fd, &ev, 1) > 0) {
411+ if (fp) {
412+ struct timeval evtime;
413+ memset(&evtime, 0, sizeof(evtime));
414+ while (evemu_read_event_realtime(fp, &ev, &evtime) > 0) {
415 frame = utouch_frame_pump_mtdev(test->fh, &ev);
416 if (frame)
417 report_frame(frame);
418 }
419+ } else {
420+ while (!mtdev_idle(test->mtdev, test->fd, 5000)) {
421+ while (mtdev_get(test->mtdev, test->fd, &ev, 1) > 0) {
422+ frame = utouch_frame_pump_mtdev(test->fh, &ev);
423+ if (frame)
424+ report_frame(frame);
425+ }
426+ }
427 }
428 }
429
430 int main(int argc, char *argv[])
431 {
432 struct frame_test test;
433- int fd;
434
435 if (argc < 2) {
436 fprintf(stderr, "Usage: %s <device>\n", argv[0]);
437 return -1;
438 }
439
440- fd = open(argv[1], O_RDONLY | O_NONBLOCK);
441- if (fd < 0) {
442+ memset(&test, 0, sizeof(test));
443+
444+ test.fd = open(argv[1], O_RDONLY | O_NONBLOCK);
445+ if (test.fd < 0) {
446 fprintf(stderr, "error: could not open device\n");
447 return -1;
448 }
449- if (ioctl(fd, EVIOCGRAB, 1)) {
450+ if (fstat(test.fd, &test.fs)) {
451+ fprintf(stderr, "error: could not stat the device\n");
452+ return -1;
453+ }
454+ if (!test.fs.st_rdev)
455+ test.fptest = fdopen(test.fd, "r");
456+
457+ if (!test.fptest && ioctl(test.fd, EVIOCGRAB, 1)) {
458 fprintf(stderr, "error: could not grab the device\n");
459 return -1;
460 }
461
462- if (init_evemu(&test, fd)) {
463+ if (init_evemu(&test)) {
464 fprintf(stderr, "error: could not describe device\n");
465 return -1;
466 }
467@@ -115,19 +147,20 @@
468
469 fprintf(stderr, "device: %s\n", evemu_get_name(test.evemu));
470
471- if (init_mtdev(&test, fd)) {
472+ if (init_mtdev(&test)) {
473 fprintf(stderr, "error: could not init mtdev\n");
474 return -1;
475 }
476- if (init_frame(&test, fd)) {
477+ if (init_frame(&test)) {
478 fprintf(stderr, "error: could not init frame\n");
479 return -1;
480 }
481
482 report_device_caps(test.fh);
483
484- loop_device(&test, fd);
485+ loop_device(&test);
486
487 destroy_all(&test);
488+
489 return 0;
490 }
491
492=== modified file 'tools/utouch-frame-test-xi2.1'
493--- tools/utouch-frame-test-xi2.1 2011-02-24 15:01:51 +0000
494+++ tools/utouch-frame-test-xi2.1 2011-03-16 07:08:31 +0000
495@@ -2,12 +2,12 @@
496 .\" Title: utouch-frame-test-xi2
497 .\" Author: [see the "AUTHOR" section]
498 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
499-.\" Date: 02/24/2011
500+.\" Date: 03/15/2011
501 .\" Manual: \ \&
502 .\" Source: \ \&
503 .\" Language: English
504 .\"
505-.TH "UTOUCH\-FRAME\-TEST\" "1" "02/24/2011" "\ \&" "\ \&"
506+.TH "UTOUCH\-FRAME\-TEST\" "1" "03/15/2011" "\ \&" "\ \&"
507 .\" -----------------------------------------------------------------
508 .\" * Define some portability stuff
509 .\" -----------------------------------------------------------------

Subscribers

People subscribed via source and target branches

to all changes: