From 8a6c25f3e77e133fb728cacb73798fd5ce02372b Mon Sep 17 00:00:00 2001 From: Viresh Kumar Date: Fri, 20 Jan 2023 14:23:51 +0530 Subject: [PATCH] gpio: Update to a newer version of libgpiod Update to a newer version of libgpiod crates. Signed-off-by: Viresh Kumar --- Cargo.lock | 4 ++-- crates/gpio/src/gpio.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f733f37..ac95722 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -339,7 +339,7 @@ checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" [[package]] name = "libgpiod" version = "0.1.0" -source = "git+https://github.com/vireshk/libgpiod?branch=vhost-gpio#d7b36c56170331699fd5e4e18918af81333aa64a" +source = "git+https://github.com/vireshk/libgpiod?branch=vhost-gpio#b412261453c3bcde60ac7597f19a042899acb68a" dependencies = [ "errno", "intmap", @@ -351,7 +351,7 @@ dependencies = [ [[package]] name = "libgpiod-sys" version = "0.1.0" -source = "git+https://github.com/vireshk/libgpiod?branch=vhost-gpio#d7b36c56170331699fd5e4e18918af81333aa64a" +source = "git+https://github.com/vireshk/libgpiod?branch=vhost-gpio#b412261453c3bcde60ac7597f19a042899acb68a" dependencies = [ "cc", ] diff --git a/crates/gpio/src/gpio.rs b/crates/gpio/src/gpio.rs index dcacf32..f4399e7 100644 --- a/crates/gpio/src/gpio.rs +++ b/crates/gpio/src/gpio.rs @@ -219,7 +219,7 @@ impl GpioDevice for PhysDevice { state.request = Some(Arc::new( self.chip - .request_lines(&rconfig, &lconfig) + .request_lines(Some(&rconfig), &lconfig) .map_err(Error::GpiodFailed)?, )); } @@ -338,7 +338,7 @@ impl GpioDevice for PhysDevice { // Wait for the interrupt for a second. if !request - .wait_edge_event(Some(Duration::new(1, 0))) + .wait_edge_events(Some(Duration::new(1, 0))) .map_err(Error::GpiodFailed)? { return Ok(false);