From 6d5acc90fb0426595304aef734a96d9ecc716e86 Mon Sep 17 00:00:00 2001 From: Zach Johnson Date: Fri, 22 Jan 2021 14:04:44 -0800 Subject: [PATCH] rusty-gd: reorg rust/acl to rust/link to prepare the way for sco, iso, etc, and encompass common link management like power, etc Bug: 171749953 Tag: #gd-refactor Test: gd/cert/run --rhost Change-Id: I972a5c8c9736d2c3a9359111e5cbdafa62478d3f --- gd/rust/{acl => link}/Android.bp | 4 +- .../{acl/src => link/src/acl}/classic/facade.rs | 45 ++++++++++++++++++---- gd/rust/{acl/src => link/src/acl}/classic/mod.rs | 2 +- gd/rust/{acl/src => link/src/acl}/core.rs | 2 +- gd/rust/{acl/src => link/src/acl}/fragment.rs | 0 gd/rust/{acl/src/lib.rs => link/src/acl/mod.rs} | 0 gd/rust/link/src/lib.rs | 13 +++++++ 7 files changed, 54 insertions(+), 12 deletions(-) rename gd/rust/{acl => link}/Android.bp (91%) rename gd/rust/{acl/src => link/src/acl}/classic/facade.rs (52%) rename gd/rust/{acl/src => link/src/acl}/classic/mod.rs (99%) rename gd/rust/{acl/src => link/src/acl}/core.rs (99%) rename gd/rust/{acl/src => link/src/acl}/fragment.rs (100%) rename gd/rust/{acl/src/lib.rs => link/src/acl/mod.rs} (100%) create mode 100644 gd/rust/link/src/lib.rs diff --git a/gd/rust/acl/Android.bp b/gd/rust/link/Android.bp similarity index 91% rename from gd/rust/acl/Android.bp rename to gd/rust/link/Android.bp index 2ad8b2d64..a77409c3a 100644 --- a/gd/rust/acl/Android.bp +++ b/gd/rust/link/Android.bp @@ -1,7 +1,7 @@ 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: [ diff --git a/gd/rust/acl/src/classic/facade.rs b/gd/rust/link/src/acl/classic/facade.rs similarity index 52% rename from gd/rust/acl/src/classic/facade.rs rename to gd/rust/link/src/acl/classic/facade.rs index b96cdadf9..313183beb 100644 --- a/gd/rust/acl/src/classic/facade.rs +++ b/gd/rust/link/src/acl/classic/facade.rs @@ -1,6 +1,6 @@ //! 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) { + fn create_connection( + &mut self, + _ctx: RpcContext<'_>, + mut _data: ConnectionMsg, + _sink: ServerStreamingSink, + ) { unimplemented!(); } - fn cancel_connection(&mut self, _ctx: RpcContext<'_>, mut _data: ConnectionMsg, _sink: UnarySink) { + fn cancel_connection( + &mut self, + _ctx: RpcContext<'_>, + mut _data: ConnectionMsg, + _sink: UnarySink, + ) { unimplemented!(); } @@ -35,11 +45,21 @@ impl AclManagerFacade for ClassicAclFacadeService { unimplemented!(); } - fn authentication_requested(&mut self, _ctx: RpcContext<'_>, mut _data: HandleMsg, _sink: UnarySink) { + fn authentication_requested( + &mut self, + _ctx: RpcContext<'_>, + mut _data: HandleMsg, + _sink: UnarySink, + ) { unimplemented!(); } - fn connection_command(&mut self, _ctx: RpcContext<'_>, mut _data: ConnectionCommandMsg, _sink: UnarySink) { + fn connection_command( + &mut self, + _ctx: RpcContext<'_>, + mut _data: ConnectionCommandMsg, + _sink: UnarySink, + ) { unimplemented!(); } @@ -51,12 +71,21 @@ impl AclManagerFacade for ClassicAclFacadeService { unimplemented!(); } - fn fetch_acl_data(&mut self, _ctx: RpcContext<'_>, mut _data: HandleMsg, _sink: ServerStreamingSink) { + fn fetch_acl_data( + &mut self, + _ctx: RpcContext<'_>, + mut _data: HandleMsg, + _sink: ServerStreamingSink, + ) { unimplemented!(); } - fn fetch_incoming_connection(&mut self, _ctx: RpcContext<'_>, mut _data: Empty, _sink: ServerStreamingSink) { + fn fetch_incoming_connection( + &mut self, + _ctx: RpcContext<'_>, + mut _data: Empty, + _sink: ServerStreamingSink, + ) { unimplemented!(); } } - diff --git a/gd/rust/acl/src/classic/mod.rs b/gd/rust/link/src/acl/classic/mod.rs similarity index 99% rename from gd/rust/acl/src/classic/mod.rs rename to gd/rust/link/src/acl/classic/mod.rs index 4c3d73921..b92e2fa93 100644 --- a/gd/rust/acl/src/classic/mod.rs +++ b/gd/rust/link/src/acl/classic/mod.rs @@ -1,6 +1,6 @@ //! 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::{ diff --git a/gd/rust/acl/src/core.rs b/gd/rust/link/src/acl/core.rs similarity index 99% rename from gd/rust/acl/src/core.rs rename to gd/rust/link/src/acl/core.rs index d612897ab..bb6583d5d 100644 --- a/gd/rust/acl/src/core.rs +++ b/gd/rust/link/src/acl/core.rs @@ -1,6 +1,6 @@ //! 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}; diff --git a/gd/rust/acl/src/fragment.rs b/gd/rust/link/src/acl/fragment.rs similarity index 100% rename from gd/rust/acl/src/fragment.rs rename to gd/rust/link/src/acl/fragment.rs diff --git a/gd/rust/acl/src/lib.rs b/gd/rust/link/src/acl/mod.rs similarity index 100% rename from gd/rust/acl/src/lib.rs rename to gd/rust/link/src/acl/mod.rs diff --git a/gd/rust/link/src/lib.rs b/gd/rust/link/src/lib.rs new file mode 100644 index 000000000..1255344bd --- /dev/null +++ b/gd/rust/link/src/lib.rs @@ -0,0 +1,13 @@ +//! link management + +/// Exposes ACL functionality +pub mod acl; + +use gddi::module; + +module! { + link_module, + submodules { + acl::acl_module, + }, +} -- 2.11.0