diff options
Diffstat (limited to 'nrf-softdevice/src/ble/gatt_server/builder.rs')
-rw-r--r-- | nrf-softdevice/src/ble/gatt_server/builder.rs | 42 |
1 files changed, 13 insertions, 29 deletions
diff --git a/nrf-softdevice/src/ble/gatt_server/builder.rs b/nrf-softdevice/src/ble/gatt_server/builder.rs index c0bff21..4d40258 100644 --- a/nrf-softdevice/src/ble/gatt_server/builder.rs +++ b/nrf-softdevice/src/ble/gatt_server/builder.rs @@ -1,6 +1,9 @@ #![allow(dead_code)] -use core::{convert::TryInto, marker::PhantomData, mem, ptr::null}; +use core::convert::TryInto; +use core::marker::PhantomData; +use core::mem; +use core::ptr::null; #[cfg(feature = "alloc")] extern crate alloc; @@ -8,12 +11,10 @@ extern crate alloc; #[cfg(feature = "alloc")] use alloc::boxed::Box; -use crate::{ble::Uuid, raw, RawError, Softdevice}; - -use super::{ - characteristic::{self, AttributeMetadata}, - CharacteristicHandles, DescriptorHandle, IncludedServiceHandle, RegisterError, ServiceHandle, -}; +use super::characteristic::{self, AttributeMetadata}; +use super::{CharacteristicHandles, DescriptorHandle, IncludedServiceHandle, RegisterError, ServiceHandle}; +use crate::ble::Uuid; +use crate::{raw, RawError, Softdevice}; pub struct ServiceBuilder<'a> { handle: u16, @@ -89,9 +90,7 @@ impl<'a> ServiceBuilder<'a> { let mut char_md = raw::ble_gatts_char_md_t { char_props, char_ext_props, - p_char_user_desc: char_md - .user_description - .map_or(null(), |x| x.value.as_ptr()), + p_char_user_desc: char_md.user_description.map_or(null(), |x| x.value.as_ptr()), char_user_desc_max_size: char_md.user_description.map_or(0, |x| x.max_len), char_user_desc_size: char_md.user_description.map_or(0, |x| x.value.len() as u16), p_char_pf: null(), @@ -112,12 +111,7 @@ impl<'a> ServiceBuilder<'a> { let mut handles: raw::ble_gatts_char_handles_t = unsafe { mem::zeroed() }; let ret = unsafe { - raw::sd_ble_gatts_characteristic_add( - self.handle, - &mut char_md as _, - &mut attr as _, - &mut handles as _, - ) + raw::sd_ble_gatts_characteristic_add(self.handle, &mut char_md as _, &mut attr as _, &mut handles as _) }; RawError::convert(ret)?; @@ -134,13 +128,9 @@ impl<'a> ServiceBuilder<'a> { }) } - pub fn include_service( - &mut self, - service: &ServiceHandle, - ) -> Result<IncludedServiceHandle, RegisterError> { + pub fn include_service(&mut self, service: &ServiceHandle) -> Result<IncludedServiceHandle, RegisterError> { let mut handle = 0; - let ret = - unsafe { raw::sd_ble_gatts_include_add(self.handle, service.0, &mut handle as _) }; + let ret = unsafe { raw::sd_ble_gatts_include_add(self.handle, service.0, &mut handle as _) }; RawError::convert(ret)?; Ok(IncludedServiceHandle(handle)) @@ -190,13 +180,7 @@ impl<'a> CharacteristicBuilder<'a> { }; let mut handle = 0; - let ret = unsafe { - raw::sd_ble_gatts_descriptor_add( - self.handles.value_handle, - &attr as _, - &mut handle as _, - ) - }; + let ret = unsafe { raw::sd_ble_gatts_descriptor_add(self.handles.value_handle, &attr as _, &mut handle as _) }; RawError::convert(ret)?; Ok(DescriptorHandle(handle)) |