kmwebnet/OpenSK
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unify drop pattern

Browse Source
This commit is contained in:
Mirna
2020-10-28 20:28:53 +02:00
parent ca30c7397d
commit 3d71da0bf5
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
third_party/libtock-drivers/src/nfc.rs vendored
View File

@@ -90,7 +90,7 @@ impl NfcTag {
/// 2. Subscribe to having a successful receive callback. /// 2. Subscribe to having a successful receive callback.
/// 3. Issue the request for reception. /// 3. Issue the request for reception.
pub fn receive(buf: &mut [u8; 256]) -> TockResult<RecvOp> { pub fn receive(buf: &mut [u8; 256]) -> TockResult<RecvOp> {
let _result = syscalls::allow(DRIVER_NUMBER, allow_nr::RECEIVE, buf)?; let result = syscalls::allow(DRIVER_NUMBER, allow_nr::RECEIVE, buf)?;
// set callback with 2 arguments, to receive ReturnCode and RX Amount // set callback with 2 arguments, to receive ReturnCode and RX Amount
let recv_data = Cell::new(None); let recv_data = Cell::new(None);
let mut callback = |result, amount| { let mut callback = |result, amount| {
@@ -99,13 +99,15 @@ impl NfcTag {
recv_amount: amount, recv_amount: amount,
})) }))
}; };
let _subscription = syscalls::subscribe::<callback::Identity2Consumer, _>( let subscription = syscalls::subscribe::<callback::Identity2Consumer, _>(
DRIVER_NUMBER, DRIVER_NUMBER,
subscribe_nr::RECEIVE, subscribe_nr::RECEIVE,
&mut callback, &mut callback,
)?; )?;
syscalls::command(DRIVER_NUMBER, command_nr::RECEIVE, 0, 0)?; syscalls::command(DRIVER_NUMBER, command_nr::RECEIVE, 0, 0)?;
util::yieldk_for(|| recv_data.get().is_some()); util::yieldk_for(|| recv_data.get().is_some());
mem::drop(subscription);
mem::drop(result);
Ok(recv_data.get().unwrap()) Ok(recv_data.get().unwrap())
} }