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

Commit 151a1741 authored by Zach Johnson's avatar Zach Johnson Committed by Automerger Merge Worker
Browse files

rusty-gd: reorg rust/acl to rust/link am: c9165010 am: 24c43de8 am: 1cfd3613 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1557058

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4219872f3ba8180cc4dcbf6ebad9cb219062c561
parents 981ba6d3 1cfd3613

system/gd/rust/acl/Android.bp→system/gd/rust/link/Android.bp

+2 −2
Original line number Diff line number Diff line 
rust_library {

    name: "libbt_acl",

    name: "libbt_link",

    defaults: ["gd_rust_defaults"],

    crate_name: "bt_acl",

    crate_name: "bt_link",

    srcs: ["src/lib.rs"],

    edition: "2018",

    rustlibs: [

system/gd/rust/acl/src/classic/facade.rs→system/gd/rust/link/src/acl/classic/facade.rs

+37 −8
Original line number Diff line number Diff line 
//! Classic ACL facade



use crate::classic::AclManager;

use crate::acl::classic::AclManager;



module! {

    facade_module,
@@ -19,11 +19,21 @@ pub struct ClassicAclFacadeService { 
}



impl AclManagerFacade for ClassicAclFacadeService {

    fn create_connection(&mut self, _ctx: RpcContext<'_>, mut _data: ConnectionMsg, _sink: ServerStreamingSink<ConnectionEvent>) {

    fn create_connection(

        &mut self,

        _ctx: RpcContext<'_>,

        mut _data: ConnectionMsg,

        _sink: ServerStreamingSink<ConnectionEvent>,

    ) {

        unimplemented!();

    }



    fn cancel_connection(&mut self, _ctx: RpcContext<'_>, mut _data: ConnectionMsg, _sink: UnarySink<Empty>) {

    fn cancel_connection(

        &mut self,

        _ctx: RpcContext<'_>,

        mut _data: ConnectionMsg,

        _sink: UnarySink<Empty>,

    ) {

        unimplemented!();

    }
@@ -35,11 +45,21 @@ impl AclManagerFacade for ClassicAclFacadeService { 
        unimplemented!();

    }



    fn authentication_requested(&mut self, _ctx: RpcContext<'_>, mut _data: HandleMsg, _sink: UnarySink<Empty>) {

    fn authentication_requested(

        &mut self,

        _ctx: RpcContext<'_>,

        mut _data: HandleMsg,

        _sink: UnarySink<Empty>,

    ) {

        unimplemented!();

    }



    fn connection_command(&mut self, _ctx: RpcContext<'_>, mut _data: ConnectionCommandMsg, _sink: UnarySink<Empty>) {

    fn connection_command(

        &mut self,

        _ctx: RpcContext<'_>,

        mut _data: ConnectionCommandMsg,

        _sink: UnarySink<Empty>,

    ) {

        unimplemented!();

    }
@@ -51,12 +71,21 @@ impl AclManagerFacade for ClassicAclFacadeService { 
        unimplemented!();

    }



    fn fetch_acl_data(&mut self, _ctx: RpcContext<'_>, mut _data: HandleMsg, _sink: ServerStreamingSink<AclData>) {

    fn fetch_acl_data(

        &mut self,

        _ctx: RpcContext<'_>,

        mut _data: HandleMsg,

        _sink: ServerStreamingSink<AclData>,

    ) {

        unimplemented!();

    }



    fn fetch_incoming_connection(&mut self, _ctx: RpcContext<'_>, mut _data: Empty, _sink: ServerStreamingSink<ConnectionEvent>) {

    fn fetch_incoming_connection(

        &mut self,

        _ctx: RpcContext<'_>,

        mut _data: Empty,

        _sink: ServerStreamingSink<ConnectionEvent>,

    ) {

        unimplemented!();

    }

}

system/gd/rust/acl/src/classic/mod.rs→system/gd/rust/link/src/acl/classic/mod.rs

+1 −1
Original line number Diff line number Diff line 
//! Classic ACL manager



use crate::core;

use crate::acl::core;

use bt_common::Bluetooth;

use bt_hci::{Address, CommandSender, EventRegistry};

use bt_packets::hci::EventChild::{

system/gd/rust/acl/src/core.rs→system/gd/rust/link/src/acl/core.rs

+1 −1
Original line number Diff line number Diff line 
//! ACL core dispatch shared between LE and classic



use crate::fragment::{fragmenting_stream, Reassembler};

use crate::acl::fragment::{fragmenting_stream, Reassembler};

use bt_common::Bluetooth::{self, Classic, Le};

use bt_hal::AclHal;

use bt_hci::{ControllerExports, EventRegistry};