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

Commit 6bbf1051 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "floss: move and rename bt_socket crate to bt_utils"

parents cb8ddeb8 d5e73828
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ edition = "2018"
[dependencies]
bt_common = { path = "../../common" }
bt_topshim = { path = "../../topshim" }
bt_socket = { path = "../socket" }
bt_utils = { path = "../utils" }
btstack = { path = "../stack" }

# external deps
+3 −1
Original line number Diff line number Diff line
use crate::bluetooth_manager::BluetoothManager;
use crate::config_util;
use bt_common::time::Alarm;
use bt_socket::{BtSocket, HciChannels, MgmtCommand, MgmtCommandResponse, MgmtEvent, HCI_DEV_NONE};
use bt_utils::socket::{
    BtSocket, HciChannels, MgmtCommand, MgmtCommandResponse, MgmtEvent, HCI_DEV_NONE,
};

use log::{debug, error, info, warn};
use nix::sys::signal::{self, Signal};
+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@
#  See the License for the specific language governing permissions and
#  limitations under the License.
[package]
name = "bt_socket"
name = "bt_utils"
version = "0.0.1"
edition = "2021"

+6 −0
Original line number Diff line number Diff line
//! Utilities

#[macro_use]
extern crate num_derive;

pub mod socket;
+0 −3
Original line number Diff line number Diff line
@@ -4,9 +4,6 @@
use std::mem;
use std::os::unix::io::{AsRawFd, RawFd};

#[macro_use]
extern crate num_derive;

use libc;
use log::debug;
use num_traits::cast::{FromPrimitive, ToPrimitive};