simplify acl handling

embassy-rs · Mar 21, 2024 · 97cae94 · 97cae94
1 parent 347964a
commit 97cae94
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 29 deletions.
diff --git a/host/src/adapter.rs b/host/src/adapter.rs
@@ -192,16 +192,7 @@ where
                 if let Some(mut p) = self.pool.alloc(ATT_ID) {
                     let len = packet.payload.len();
                     p.as_mut()[..len].copy_from_slice(packet.payload);
-                    self.att_inbound
-                        .send((
-                            conn,
-                            Pdu {
-                                packet: p,
-                                pb: acl.boundary_flag(),
-                                len,
-                            },
-                        ))
-                        .await;
+                    self.att_inbound.send((conn, Pdu { packet: p, len })).await;
                 } else {
                     // TODO: Signal back
                 }
@@ -310,7 +301,12 @@ where
             // Task handling shuffling outbound ACL data.
             let tx_fut = async {
                 let (handle, pdu) = self.outbound.receive().await;
-                let acl = AclPacket::new(handle, pdu.pb, AclBroadcastFlag::PointToPoint, pdu.as_ref());
+                let acl = AclPacket::new(
+                    handle,
+                    AclPacketBoundary::FirstNonFlushable,
+                    AclBroadcastFlag::PointToPoint,
+                    pdu.as_ref(),
+                );
                 match self.controller.write_acl_data(&acl).await {
                     Ok(_) => {}
                     Err(e) => {

diff --git a/host/src/l2cap.rs b/host/src/l2cap.rs
@@ -84,11 +84,7 @@ impl<'a, 'd, const MTU: usize> L2capChannel<'a, 'd, MTU> {
                 w.append(first)?;
                 w.len()
             };
-            let pdu = if remaining.is_empty() {
-                Pdu::new(packet, len)
-            } else {
-                Pdu::new(packet, len)
-            };
+            let pdu = Pdu::new(packet, len);
             self.tx.send((self.conn, pdu)).await;
         } else {
             return Err(Error::OutOfMemory);
@@ -105,11 +101,7 @@ impl<'a, 'd, const MTU: usize> L2capChannel<'a, 'd, MTU> {
                     w.append(chunk)?;
                     w.len()
                 };
-                let pdu = if i == num_chunks - 1 {
-                    Pdu::new(packet, len)
-                } else {
-                    Pdu::new(packet, len)
-                };
+                let pdu = Pdu::new(packet, len);
                 self.tx.send((self.conn, pdu)).await;
             } else {
                 return Err(Error::OutOfMemory);

diff --git a/host/src/pdu.rs b/host/src/pdu.rs
@@ -1,20 +1,13 @@
-use bt_hci::data::AclPacketBoundary;
-
 use crate::packet_pool::Packet;
 
 pub struct Pdu<'d> {
     pub packet: Packet<'d>,
-    pub pb: AclPacketBoundary,
     pub len: usize,
 }
 
 impl<'d> Pdu<'d> {
     pub fn new(packet: Packet<'d>, len: usize) -> Self {
-        Self {
-            packet,
-            pb: AclPacketBoundary::FirstNonFlushable,
-            len,
-        }
+        Self { packet, len }
     }
 }