Mirrors/vuinputd
1
0
Fork 0
mirror of https://github.com/joleuger/vuinputd.git synced 2026-07-17 16:36:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes for rumble test scenario

Browse source
This commit is contained in:
Johannes Leupolz 2026-04-03 23:03:58 +00:00
parent 96719c0a9c
commit 0fda223d4e
3 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

26
vuinputd-tests/src/devices/device_base.rs
View file

@ -78,7 +78,7 @@ pub trait Device: Sized {
read_event(event_device_fd)
}
/// Emit and read an event with logging
/// Emit (to uinput) and read (from evdev) an event with logging
fn emit_read_and_log(
&mut self,
ev_type: u16,
@ -86,7 +86,20 @@ pub trait Device: Sized {
val: i32,
) -> io::Result<LoggedInputEvent> {
let event_device_fd = self.get_event_device()?;
let event = emit_read_and_log(self.uinput_fd(), event_device_fd, ev_type, code, val)?;
let event = emit_read_and_log(self.uinput_fd(), event_device_fd, ev_type, code, val, true)?;
self.state_mut().events.push(event.clone());
Ok(event)
}
/// Emit and read an event with logging
fn emit_to_evdev_read_from_uinput_and_log(
&mut self,
ev_type: u16,
code: u16,
val: i32,
) -> io::Result<LoggedInputEvent> {
let event_device_fd = self.get_event_device()?;
let event = emit_read_and_log(event_device_fd, self.uinput_fd(), ev_type, code, val, false)?;
self.state_mut().events.push(event.clone());
Ok(event)
}
@ -184,12 +197,17 @@ pub fn emit_read_and_log(
ev_type: u16,
code: u16,
val: i32,
emit_syn: bool,
) -> io::Result<LoggedInputEvent> {
let (time_sent_sec, time_sent_nsec) = monotonic_time();
emit(emit_to, ev_type, code, val)?;
emit(emit_to, EV_SYN, SYN_REPORT, 0)?;
if emit_syn {
emit(emit_to, EV_SYN, SYN_REPORT, 0)?;
}
let input_event_recv = read_event(read_from).unwrap();
let _syn_recv = read_event(read_from).unwrap();
if emit_syn {
let _syn_recv = read_event(read_from).unwrap();
}
let (time_recv_sec, time_recv_nsec) = monotonic_time();
let duration_usec =
(time_recv_sec - time_sent_sec) * 1_000_000 + (time_recv_nsec - time_sent_nsec) / 1000;

1
vuinputd-tests/src/devices/xbox_gamepad.rs
View file

@ -351,6 +351,7 @@ impl XboxGamepadDevice {
}
else {
println!("event: {} {} {}",input_event.type_,input_event.code,input_event.value);
crate::devices::utils::emit(fd, input_event.type_,input_event.code,input_event.value).unwrap();
}
} else {

3
vuinputd/src/cuse_device/vuinput_open.rs
View file

@ -46,8 +46,7 @@ pub unsafe extern "C" fn vuinput_open(
let open_vuinput_result = OpenOptions::new()
.read(true)
.write(true)
.custom_flags(O_NONBLOCK)
.custom_flags(O_CLOEXEC)
.custom_flags(O_NONBLOCK | O_CLOEXEC)
.open(Path::new("/dev/uinput"));
match open_vuinput_result {
Ok(v) => {