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

Commit 7b55e13d authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "floss: Add socket profile to topshim"

parents 37675235 0bc15d00

system/gd/rust/topshim/Android.bp

+2 −0
Original line number Original line Diff line number Diff line
@@ -126,6 +126,8 @@ rust_bindgen { 
        "--allowlist-type=btgatt_.*",

        "--allowlist-type=btgatt_.*",

        "--allowlist-type=bluetooth_sdp.*",

        "--allowlist-type=bluetooth_sdp.*",

        "--allowlist-type=btsdp.*",

        "--allowlist-type=btsdp.*",

        "--allowlist-type=btsock_.*",

        "--allowlist-type=sock_connect_signal_t",

        "--enable-cxx-namespaces",

        "--enable-cxx-namespaces",

        "--opaque-type=std::.*",

        "--opaque-type=std::.*",

        "--with-derive-default",

        "--with-derive-default",

system/gd/rust/topshim/bindings/wrapper.hpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -9,3 +9,4 @@ 
#include "hardware/bt_gatt.h"

#include "hardware/bt_gatt.h"

#include "hardware/bt_hh.h"

#include "hardware/bt_hh.h"

#include "hardware/bt_sdp.h"

#include "hardware/bt_sdp.h"

#include "hardware/bt_sock.h"

system/gd/rust/topshim/build.rs

+2 −1
Original line number Original line Diff line number Diff line
@@ -46,7 +46,8 @@ fn main() { 
        .clang_args(clang_args)

        .clang_args(clang_args)

        .enable_cxx_namespaces()

        .enable_cxx_namespaces()

        .size_t_is_usize(true)

        .size_t_is_usize(true)

        .allowlist_type("(bt_|bthh_|btgatt_|btsdp|bluetooth_sdp).*")

        .allowlist_type("(bt_|bthh_|btgatt_|btsdp|bluetooth_sdp|btsock_).*")

        .allowlist_type("sock_connect_signal_t")

        .allowlist_function("(bt_|bthh_|btgatt_|btsdp).*")

        .allowlist_function("(bt_|bthh_|btgatt_|btsdp).*")

        .allowlist_function("hal_util_.*")

        .allowlist_function("hal_util_.*")

        // We must opaque out std:: in order to prevent bindgen from choking

        // We must opaque out std:: in order to prevent bindgen from choking

system/gd/rust/topshim/src/btif.rs

+2 −0
Original line number Original line Diff line number Diff line
@@ -553,6 +553,7 @@ pub enum SupportedProfiles { 
    A2dp,

    A2dp,

    Gatt,

    Gatt,

    Sdp,

    Sdp,

    Socket,

}

}





impl From<SupportedProfiles> for Vec<u8> {

impl From<SupportedProfiles> for Vec<u8> {
@@ -563,6 +564,7 @@ impl From<SupportedProfiles> for Vec<u8> { 
            SupportedProfiles::A2dp => "a2dp",

            SupportedProfiles::A2dp => "a2dp",

            SupportedProfiles::Gatt => "gatt",

            SupportedProfiles::Gatt => "gatt",

            SupportedProfiles::Sdp => "sdp",

            SupportedProfiles::Sdp => "sdp",

            SupportedProfiles::Socket => "socket",

        }

        }

        .bytes()

        .bytes()

        .chain("\0".bytes())

        .chain("\0".bytes())

system/gd/rust/topshim/src/profiles/mod.rs

+1 −0
Original line number Original line Diff line number Diff line
@@ -6,3 +6,4 @@ pub mod gatt; 
pub mod hfp;

pub mod hfp;

pub mod hid_host;

pub mod hid_host;

pub mod sdp;

pub mod sdp;

pub mod socket;