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

Commit dded0651 authored by Charlie Boutier's avatar Charlie Boutier Committed by Automerger Merge Worker
Browse files

Merge "uwb_hal: handle data_packet parsing" into main am: 4e2937b4 

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



Change-Id: I38544917b24005c0c2333baa1b77eacae95c9033
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a1e3ba1c 4e2937b4

uwb/aidl/default/src/uwb_chip.rs

+12 −1
Original line number Diff line number Diff line
@@ -180,6 +180,8 @@ impl IUwbChipAsyncServer for UwbChip { 
            let mut reader = AsyncFd::new(reader).unwrap();



            loop {

                const MESSAGE_TYPE_MASK: u8 = 0b11100000;

                const DATA_MESSAGE_TYPE: u8 = 0b000;

                const UWB_HEADER_SIZE: usize = 4;

                let mut buffer = vec![0; UWB_HEADER_SIZE];
@@ -224,7 +226,16 @@ impl IUwbChipAsyncServer for UwbChip { 
                // Read the remaining header bytes, if truncated.

                read_exact(reader.get_mut(), &mut buffer[read_len..]).unwrap();



                let length = buffer[3] as usize + UWB_HEADER_SIZE;

                let common_header = buffer[0];

                let mt = (common_header & MESSAGE_TYPE_MASK) >> 5;

                let payload_length = if mt == DATA_MESSAGE_TYPE {

                    let payload_length_fields: [u8; 2] = buffer[2..=3].try_into().unwrap();

                    u16::from_le_bytes(payload_length_fields) as usize

                } else {

                    buffer[3] as usize

                };



                let length = payload_length + UWB_HEADER_SIZE;

                buffer.resize(length, 0);



                // Read the payload bytes.