evdev: move mpers-specific parsers to a separate file
This change reduces binary code duplication on mpers platforms and prepares evdev parsers to use printxval_bsearch. * defs.h (evdev_ioctl, print_evdev_ff_type): New prototypes. * evdev.c (evdev_ioctl): Un-mpersify. (evdev_write_ioctl) Remove EVIOCSFF case, forward default case to evdev_write_ioctl_mpers. (decode_envelope, ff_effect_ioctl): Move to... * evdev_mpers.c: ... new file. * Makefile.am (strace_SOURCES): Add evdev_mpers.c.
This commit is contained in:
parent
bf4aaabfed
commit
dfc59e7061
@ -123,6 +123,7 @@ strace_SOURCES = \
|
||||
error_prints.c \
|
||||
error_prints.h \
|
||||
evdev.c \
|
||||
evdev_mpers.c \
|
||||
eventfd.c \
|
||||
execve.c \
|
||||
fadvise.c \
|
||||
|
||||
2
defs.h
2
defs.h
@ -697,6 +697,7 @@ name ## _ioctl(struct tcb *, unsigned int request, kernel_ulong_t arg) \
|
||||
/* End of DECL_IOCTL definition. */
|
||||
|
||||
DECL_IOCTL(dm);
|
||||
DECL_IOCTL(evdev);
|
||||
DECL_IOCTL(file);
|
||||
DECL_IOCTL(fs_x);
|
||||
DECL_IOCTL(kvm);
|
||||
@ -709,6 +710,7 @@ DECL_IOCTL(uffdio);
|
||||
#undef DECL_IOCTL
|
||||
|
||||
extern int decode_sg_io_v4(struct tcb *, const kernel_ulong_t arg);
|
||||
extern void print_evdev_ff_type(const kernel_ulong_t val);
|
||||
|
||||
struct nlmsghdr;
|
||||
|
||||
|
||||
122
evdev.c
122
evdev.c
@ -31,19 +31,9 @@
|
||||
|
||||
#ifdef HAVE_LINUX_INPUT_H
|
||||
|
||||
#include DEF_MPERS_TYPE(struct_ff_effect)
|
||||
|
||||
# include <linux/ioctl.h>
|
||||
# include <linux/input.h>
|
||||
|
||||
typedef struct ff_effect struct_ff_effect;
|
||||
|
||||
#endif /* HAVE_LINUX_INPUT_H */
|
||||
|
||||
#include MPERS_DEFS
|
||||
|
||||
#ifdef HAVE_LINUX_INPUT_H
|
||||
|
||||
# include "xlat/evdev_autorepeat.h"
|
||||
# include "xlat/evdev_ff_status.h"
|
||||
# include "xlat/evdev_ff_types.h"
|
||||
@ -61,99 +51,6 @@ typedef struct ff_effect struct_ff_effect;
|
||||
# define SYN_MAX 0xf
|
||||
# endif
|
||||
|
||||
static void
|
||||
decode_envelope(void *const data)
|
||||
{
|
||||
const struct ff_envelope *const envelope = data;
|
||||
|
||||
tprintf(", envelope={attack_length=%" PRIu16
|
||||
", attack_level=%" PRIu16
|
||||
", fade_length=%" PRIu16
|
||||
", fade_level=%#x}",
|
||||
envelope->attack_length,
|
||||
envelope->attack_level,
|
||||
envelope->fade_length,
|
||||
envelope->fade_level);
|
||||
}
|
||||
|
||||
static int
|
||||
ff_effect_ioctl(struct tcb *const tcp, const kernel_ulong_t arg)
|
||||
{
|
||||
tprints(", ");
|
||||
|
||||
struct_ff_effect ffe;
|
||||
|
||||
if (umove_or_printaddr(tcp, arg, &ffe))
|
||||
return RVAL_IOCTL_DECODED;
|
||||
|
||||
tprints("{type=");
|
||||
printxval(evdev_ff_types, ffe.type, "FF_???");
|
||||
tprintf(", id=%" PRIu16
|
||||
", direction=%" PRIu16 ", ",
|
||||
ffe.id,
|
||||
ffe.direction);
|
||||
|
||||
if (abbrev(tcp)) {
|
||||
tprints("...}");
|
||||
return RVAL_IOCTL_DECODED;
|
||||
}
|
||||
|
||||
tprintf("trigger={button=%" PRIu16
|
||||
", interval=%" PRIu16 "}"
|
||||
", replay={length=%" PRIu16
|
||||
", delay=%" PRIu16 "}",
|
||||
ffe.trigger.button,
|
||||
ffe.trigger.interval,
|
||||
ffe.replay.length,
|
||||
ffe.replay.delay);
|
||||
|
||||
switch (ffe.type) {
|
||||
case FF_CONSTANT:
|
||||
tprintf(", constant={level=%" PRId16,
|
||||
ffe.u.constant.level);
|
||||
decode_envelope(&ffe.u.constant.envelope);
|
||||
tprints("}");
|
||||
break;
|
||||
case FF_RAMP:
|
||||
tprintf(", ramp={start_level=%" PRId16
|
||||
", end_level=%" PRId16,
|
||||
ffe.u.ramp.start_level,
|
||||
ffe.u.ramp.end_level);
|
||||
decode_envelope(&ffe.u.ramp.envelope);
|
||||
tprints("}");
|
||||
break;
|
||||
case FF_PERIODIC:
|
||||
tprintf(", periodic={waveform=%" PRIu16
|
||||
", period=%" PRIu16
|
||||
", magnitude=%" PRId16
|
||||
", offset=%" PRId16
|
||||
", phase=%" PRIu16,
|
||||
ffe.u.periodic.waveform,
|
||||
ffe.u.periodic.period,
|
||||
ffe.u.periodic.magnitude,
|
||||
ffe.u.periodic.offset,
|
||||
ffe.u.periodic.phase);
|
||||
decode_envelope(&ffe.u.periodic.envelope);
|
||||
tprintf(", custom_len=%u, custom_data=",
|
||||
ffe.u.periodic.custom_len);
|
||||
printaddr(ptr_to_kulong(ffe.u.periodic.custom_data));
|
||||
tprints("}");
|
||||
break;
|
||||
case FF_RUMBLE:
|
||||
tprintf(", rumble={strong_magnitude=%" PRIu16
|
||||
", weak_magnitude=%" PRIu16 "}",
|
||||
ffe.u.rumble.strong_magnitude,
|
||||
ffe.u.rumble.weak_magnitude);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
tprints("}");
|
||||
|
||||
return RVAL_IOCTL_DECODED;
|
||||
}
|
||||
|
||||
static int
|
||||
abs_ioctl(struct tcb *const tcp, const kernel_ulong_t arg)
|
||||
{
|
||||
@ -489,8 +386,6 @@ evdev_write_ioctl(struct tcb *const tcp, const unsigned int code,
|
||||
case EVIOCSKEYCODE_V2:
|
||||
return keycode_V2_ioctl(tcp, arg);
|
||||
# endif
|
||||
case EVIOCSFF:
|
||||
return ff_effect_ioctl(tcp, arg);
|
||||
case EVIOCRMFF:
|
||||
tprintf(", %d", (int) arg);
|
||||
return RVAL_IOCTL_DECODED;
|
||||
@ -506,6 +401,12 @@ evdev_write_ioctl(struct tcb *const tcp, const unsigned int code,
|
||||
printnum_int(tcp, arg, "%u");
|
||||
return RVAL_IOCTL_DECODED;
|
||||
# endif
|
||||
default: {
|
||||
int rc = evdev_write_ioctl_mpers(tcp, code, arg);
|
||||
|
||||
if (rc != RVAL_DECODED)
|
||||
return rc;
|
||||
}
|
||||
}
|
||||
|
||||
/* multi-number fixed-length commands */
|
||||
@ -515,8 +416,15 @@ evdev_write_ioctl(struct tcb *const tcp, const unsigned int code,
|
||||
return 0;
|
||||
}
|
||||
|
||||
MPERS_PRINTER_DECL(int, evdev_ioctl, struct tcb *const tcp,
|
||||
const unsigned int code, const kernel_ulong_t arg)
|
||||
void
|
||||
print_evdev_ff_type(const kernel_ulong_t val)
|
||||
{
|
||||
printxval(evdev_ff_types, val, "FF_???");
|
||||
}
|
||||
|
||||
int
|
||||
evdev_ioctl(struct tcb *const tcp,
|
||||
const unsigned int code, const kernel_ulong_t arg)
|
||||
{
|
||||
switch (_IOC_DIR(code)) {
|
||||
case _IOC_READ:
|
||||
|
||||
151
evdev_mpers.c
Normal file
151
evdev_mpers.c
Normal file
@ -0,0 +1,151 @@
|
||||
/*
|
||||
* Copyright (c) 2015 Etienne Gemsa <etienne.gemsa@lse.epita.fr>
|
||||
* Copyright (c) 2015-2016 Dmitry V. Levin <ldv@altlinux.org>
|
||||
* Copyright (c) 2015-2018 The strace developers.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. The name of the author may not be used to endorse or promote products
|
||||
* derived from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
||||
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
||||
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include "defs.h"
|
||||
|
||||
#ifdef HAVE_LINUX_INPUT_H
|
||||
|
||||
#include DEF_MPERS_TYPE(struct_ff_effect)
|
||||
|
||||
# include <linux/ioctl.h>
|
||||
# include <linux/input.h>
|
||||
|
||||
typedef struct ff_effect struct_ff_effect;
|
||||
|
||||
#endif /* HAVE_LINUX_INPUT_H */
|
||||
|
||||
#include MPERS_DEFS
|
||||
|
||||
#ifdef HAVE_LINUX_INPUT_H
|
||||
|
||||
static void
|
||||
decode_envelope(void *const data)
|
||||
{
|
||||
const struct ff_envelope *const envelope = data;
|
||||
|
||||
tprintf(", envelope={attack_length=%" PRIu16
|
||||
", attack_level=%" PRIu16
|
||||
", fade_length=%" PRIu16
|
||||
", fade_level=%#x}",
|
||||
envelope->attack_length,
|
||||
envelope->attack_level,
|
||||
envelope->fade_length,
|
||||
envelope->fade_level);
|
||||
}
|
||||
|
||||
static int
|
||||
ff_effect_ioctl(struct tcb *const tcp, const kernel_ulong_t arg)
|
||||
{
|
||||
tprints(", ");
|
||||
|
||||
struct_ff_effect ffe;
|
||||
|
||||
if (umove_or_printaddr(tcp, arg, &ffe))
|
||||
return RVAL_IOCTL_DECODED;
|
||||
|
||||
tprints("{type=");
|
||||
print_evdev_ff_type(ffe.type);
|
||||
tprintf(", id=%" PRIu16
|
||||
", direction=%" PRIu16 ", ",
|
||||
ffe.id,
|
||||
ffe.direction);
|
||||
|
||||
if (abbrev(tcp)) {
|
||||
tprints("...}");
|
||||
return RVAL_IOCTL_DECODED;
|
||||
}
|
||||
|
||||
tprintf("trigger={button=%" PRIu16
|
||||
", interval=%" PRIu16 "}"
|
||||
", replay={length=%" PRIu16
|
||||
", delay=%" PRIu16 "}",
|
||||
ffe.trigger.button,
|
||||
ffe.trigger.interval,
|
||||
ffe.replay.length,
|
||||
ffe.replay.delay);
|
||||
|
||||
switch (ffe.type) {
|
||||
case FF_CONSTANT:
|
||||
tprintf(", constant={level=%" PRId16,
|
||||
ffe.u.constant.level);
|
||||
decode_envelope(&ffe.u.constant.envelope);
|
||||
tprints("}");
|
||||
break;
|
||||
case FF_RAMP:
|
||||
tprintf(", ramp={start_level=%" PRId16
|
||||
", end_level=%" PRId16,
|
||||
ffe.u.ramp.start_level,
|
||||
ffe.u.ramp.end_level);
|
||||
decode_envelope(&ffe.u.ramp.envelope);
|
||||
tprints("}");
|
||||
break;
|
||||
case FF_PERIODIC:
|
||||
tprintf(", periodic={waveform=%" PRIu16
|
||||
", period=%" PRIu16
|
||||
", magnitude=%" PRId16
|
||||
", offset=%" PRId16
|
||||
", phase=%" PRIu16,
|
||||
ffe.u.periodic.waveform,
|
||||
ffe.u.periodic.period,
|
||||
ffe.u.periodic.magnitude,
|
||||
ffe.u.periodic.offset,
|
||||
ffe.u.periodic.phase);
|
||||
decode_envelope(&ffe.u.periodic.envelope);
|
||||
tprintf(", custom_len=%u, custom_data=",
|
||||
ffe.u.periodic.custom_len);
|
||||
printaddr(ptr_to_kulong(ffe.u.periodic.custom_data));
|
||||
tprints("}");
|
||||
break;
|
||||
case FF_RUMBLE:
|
||||
tprintf(", rumble={strong_magnitude=%" PRIu16
|
||||
", weak_magnitude=%" PRIu16 "}",
|
||||
ffe.u.rumble.strong_magnitude,
|
||||
ffe.u.rumble.weak_magnitude);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
tprints("}");
|
||||
|
||||
return RVAL_IOCTL_DECODED;
|
||||
}
|
||||
|
||||
MPERS_PRINTER_DECL(int, evdev_write_ioctl_mpers, struct tcb *const tcp,
|
||||
const unsigned int code, const kernel_ulong_t arg)
|
||||
{
|
||||
switch (code) {
|
||||
case EVIOCSFF:
|
||||
return ff_effect_ioctl(tcp, arg);
|
||||
default:
|
||||
return RVAL_DECODED;
|
||||
}
|
||||
}
|
||||
|
||||
#endif /* HAVE_LINUX_INPUT_H */
|
||||
Loading…
x
Reference in New Issue
Block a user