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

Commit 3fbb1149 authored by David Duarte's avatar David Duarte
Browse files

Update to pdl 0.3.0 

Bug: 343968814
Test: m root-canal
Flag: TEST_ONLY
Change-Id: Ie16817255a3960dd8cc4976b078f52feaaded21b
parent f910abb3

tools/rootcanal/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ genrule { 


genrule {

    name: "rootcanal_link_layer_packets_rust_gen",

    defaults: ["pdl_rust_generator_defaults"],

    defaults: ["pdl_rust_legacy_generator_defaults"],

    srcs: ["packets/link_layer_packets.pdl"],

    out: ["link_layer_packets.rs"],

}
@@ -485,7 +485,7 @@ genrule { 


genrule {

    name: "rootcanal_hci_packets_rust_gen",

    defaults: ["pdl_rust_generator_defaults"],

    defaults: ["pdl_rust_legacy_generator_defaults"],

    srcs: ["packets/hci_packets.pdl"],

    out: ["hci_packets.rs"],

}

tools/rootcanal/CMakeLists.txt

+1 −3
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ corrosion_import_crate( 
    MANIFEST_PATH ${PDL_ROOT}/Cargo.toml

    FLAGS --offline --verbose --verbose)



corrosion_set_env_vars(generate-canonical-tests CARGO_HOME=${Rust_CARGO_HOME})

corrosion_set_env_vars(pdlc CARGO_HOME=${Rust_CARGO_HOME})

corrosion_set_hostbuild(pdlc)
@@ -15,7 +14,6 @@ get_property(pdlc_EXECUTABLE TARGET pdlc PROPERTY EXECUTABLE_PATH) 
# These tests depend on the tempfile crate which was not imported because

# the crate remove_dir_all does not have a compatible version.

set_tests_properties(cargo-test_pdlc PROPERTIES DISABLED True)

set_tests_properties(cargo-test_generate-canonical-tests PROPERTIES DISABLED True)



android_license(

    TARGET pdlc
@@ -60,7 +58,7 @@ function(pdl_gen) 
        OUTPUT "${pdl_OUTPUT_ABSOLUTE}"

        COMMAND

        ${pdlc_EXECUTABLE}

                --output-format rust

                --output-format rust_legacy

                "${pdl_INPUT_ABSOLUTE}"

                    > "${pdl_OUTPUT_ABSOLUTE}"

        COMMENT "Generating rust module from ${pdl_INPUT}"

tools/rootcanal/rust/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -36,14 +36,14 @@ rust_ffi { 


genrule {

    name: "rootcanal_lmp_packets_rust_gen",

    defaults: ["pdl_rust_generator_defaults"],

    defaults: ["pdl_rust_legacy_generator_defaults"],

    srcs: ["lmp_packets.pdl"],

    out: ["lmp_packets.rs"],

}



genrule {

    name: "rootcanal_llcp_packets_rust_gen",

    defaults: ["pdl_rust_generator_defaults"],

    defaults: ["pdl_rust_legacy_generator_defaults"],

    srcs: ["llcp_packets.pdl"],

    out: ["llcp_packets.rs"],

}

tools/rootcanal/rust/Cargo.toml

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ num-derive = "0.3.3" 
num-integer = "0.1.45"

num-traits = "0.2.14"

paste = "1.0.4"

pdl-runtime = "0.2.2"

pdl-runtime = "0.3.0"

pin-utils = "0.1.0"

rand = "0.8.3"

thiserror = "1.0.23"

tools/rootcanal/rust/src/llcp/iso.rs

+2 −2
Original line number Diff line number Diff line
@@ -327,11 +327,11 @@ impl IsoManager { 
    }



    fn send_hci_event<E: Into<hci::Event>>(&self, event: E) {

        self.ops.send_hci_event(&event.into().to_vec())

        self.ops.send_hci_event(&event.into().encode_to_vec().unwrap())

    }



    fn send_llcp_packet<P: Into<llcp::LlcpPacket>>(&self, acl_connection_handle: u16, packet: P) {

        self.ops.send_llcp_packet(acl_connection_handle, &packet.into().to_vec())

        self.ops.send_llcp_packet(acl_connection_handle, &packet.into().encode_to_vec().unwrap())

    }



    fn get_le_features(&self) -> u64 {