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

Commit cad5e8a5 authored by Archie Pusaka's avatar Archie Pusaka Committed by Gerrit Code Review
Browse files

Merge changes I166268a2,I8f647ea4 into main 

* changes:
  Floss: Hcidoc: Allow reserved status for L2CAP connection
  Floss: Hcidoc: Remove pending disconnection on reconnection
parents 28e15953 21829095

floss/hcidoc/packets/l2cap_packets.pdl

+1 −0
Original line number Diff line number Diff line
@@ -251,6 +251,7 @@ enum ConnectionResponseStatus : 16 { 
  NO_FURTHER_INFORMATION_AVAILABLE = 0x0000,

  AUTHENTICATION_PENDING = 0x0001,

  AUTHORIZATION_PENDING = 0x0002,

  RESERVED = ..,

}



packet ConnectionResponse : Control (code = CONNECTION_RESPONSE) {

floss/hcidoc/src/groups/connections.rs

+3 −0
Original line number Diff line number Diff line
@@ -350,6 +350,7 @@ impl OddDisconnectionsRule { 
        if let Some(_) = self.connection_attempt.remove(&address) {

            if status == ErrorCode::Success {

                self.active_handles.insert(handle, (packet.ts, address));

                self.pending_disconnect_due_to_host_power_off.remove(&handle);

            } else {

                self.reportable.push((

                    packet.ts,
@@ -449,6 +450,7 @@ impl OddDisconnectionsRule { 
        if let Some(_) = self.sco_connection_attempt.remove(&address) {

            if status == ErrorCode::Success {

                self.active_handles.insert(handle, (packet.ts, address));

                self.pending_disconnect_due_to_host_power_off.remove(&handle);

            } else {

                self.reportable.push((

                    packet.ts,
@@ -486,6 +488,7 @@ impl OddDisconnectionsRule { 
        if let Some(_) = self.le_connection_attempt.remove(&addr_to_remove) {

            if status == ErrorCode::Success {

                self.active_handles.insert(handle, (packet.ts, address));

                self.pending_disconnect_due_to_host_power_off.remove(&handle);

            } else {

                let message = if use_accept_list {

                    format!("LeConnectionComplete error {:?} for accept list", status)

floss/hcidoc/src/groups/informational.rs

+1 −0
Original line number Diff line number Diff line
@@ -552,6 +552,7 @@ impl InformationalRule { 
        let device = self.get_or_allocate_device(address);

        device.report_connection_start(handle, ts);

        self.handles.insert(handle, *address);

        self.pending_disconnect_due_to_host_power_off.remove(&handle);

    }



    fn report_sco_connection_start(