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

Resolve Comments

Browse Source
This commit is contained in:
Mirna
2020-10-28 19:11:09 +02:00
parent db0a22e5c5
commit ce446f571c
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,6 +13,7 @@ mod command_nr {
pub const EMULATE: usize = 3; pub const EMULATE: usize = 3;
pub const CONFIGURE: usize = 4; pub const CONFIGURE: usize = 4;
pub const FRAMEDELAYMAX: usize = 5; pub const FRAMEDELAYMAX: usize = 5;
pub const SELECTED: usize = 6;
} }
mod subscribe_nr { mod subscribe_nr {
@@ -27,6 +28,7 @@ mod allow_nr {
} }
#[allow(dead_code)] #[allow(dead_code)]
#[derive(Clone, Copy)]
pub struct RecvOp { pub struct RecvOp {
pub result_code: usize, pub result_code: usize,
pub recv_amount: usize, pub recv_amount: usize,
@@ -65,6 +67,11 @@ impl NfcTag {
return false; return false;
} }
let result = syscalls::command(DRIVER_NUMBER, command_nr::SELECTED, 0, 0);
if result.is_err() {
return false;
}
util::yieldk_for(|| is_selected.get()); util::yieldk_for(|| is_selected.get());
true true
} }
@@ -83,27 +90,23 @@ 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 result_code = Cell::new(None); let recv_data = Cell::new(None);
let recv_amount = Cell::new(None);
let mut callback = |result, amount| { let mut callback = |result, amount| {
result_code.set(Some(result)); recv_data.set(Some(RecvOp {
recv_amount.set(Some(amount)) result_code: result,
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_amount.get().is_some()); util::yieldk_for(|| recv_data.get().is_some());
mem::drop(subscription); Ok(recv_data.get().unwrap())
mem::drop(result);
Ok(RecvOp {
result_code: result_code.get().unwrap(),
recv_amount: recv_amount.get().unwrap(),
})
} }
/// 1. Share with the driver a buffer containing the app's reply. /// 1. Share with the driver a buffer containing the app's reply.