Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1e0c41c authored by Matthew Maurer's avatar Matthew Maurer Committed by Automerger Merge Worker
Browse files

Merge "Fix for nix 0.27.1." into main am: be8bf80c 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2859925



Change-Id: Id9f746bc66671d274afaedb10854d88123a04af0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 98c6489c be8bf80c

uwb/aidl/default/src/uwb_chip.rs

+3 −6
Original line number Original line Diff line number Diff line
@@ -14,7 +14,6 @@ use tokio_util::sync::CancellationToken; 




use std::fs::{File, OpenOptions};

use std::fs::{File, OpenOptions};

use std::io::{self, Read, Write};

use std::io::{self, Read, Write};

use std::os::fd::AsRawFd;

use std::os::unix::fs::OpenOptionsExt;

use std::os::unix::fs::OpenOptionsExt;





enum State {

enum State {
@@ -61,13 +60,11 @@ impl State { 
}

}





pub fn makeraw(file: File) -> io::Result<File> {

pub fn makeraw(file: File) -> io::Result<File> {

    let fd = file.as_raw_fd();

    // Configure the file descriptor as raw fd.



    // Configure the file descritpro as raw fd.

    use nix::sys::termios::*;

    use nix::sys::termios::*;

    let mut attrs = tcgetattr(fd)?;

    let mut attrs = tcgetattr(&file)?;

    cfmakeraw(&mut attrs);

    cfmakeraw(&mut attrs);

    tcsetattr(fd, SetArg::TCSANOW, &attrs)?;

    tcsetattr(&file, SetArg::TCSANOW, &attrs)?;





    Ok(file)

    Ok(file)

}

}