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

Updated Functions Return Types

Browse Source
This commit is contained in:
Mirna
2020-10-21 19:30:58 +02:00
parent 7e0a48ae1c
commit 8cb85563da
1 changed files with 41 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,7 @@
use crate::result::TockError;
use crate::util; use crate::util;
use core::cell::Cell; use core::cell::Cell;
use libtock_core::result::{ENOMEM, SUCCESS}; use core::mem;
use libtock_core::{callback, syscalls}; use libtock_core::{callback, syscalls};
const DRIVER_NUMBER: usize = 0x30003; const DRIVER_NUMBER: usize = 0x30003;
@@ -24,11 +25,10 @@ mod allow_nr {
pub const RECEIVE: usize = 2; pub const RECEIVE: usize = 2;
} }
pub enum TransOrRecvStatus { #[allow(dead_code)]
Error, pub struct RecvOp {
InvalidBuffer, pub result_code: usize,
OOM, pub recv_amount: usize,
Success,
} }
pub struct NfcTag {} pub struct NfcTag {}
@@ -76,61 +76,53 @@ impl NfcTag {
/// 1. Share with the driver a buffer. /// 1. Share with the driver a buffer.
/// 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]) -> TransOrRecvStatus { pub fn receive(buf: &mut [u8; 256]) -> Result<RecvOp, TockError> {
let result = syscalls::allow(DRIVER_NUMBER, allow_nr::RECEIVE, buf); let result = syscalls::allow(DRIVER_NUMBER, allow_nr::RECEIVE, buf)?;
if result.is_err() { // set callback with 2 arguments, to receive ReturnCode and RX Amount
return TransOrRecvStatus::InvalidBuffer;
}
let done = Cell::new(false); let done = Cell::new(false);
let mut alarm = || done.set(true); let result_code = Cell::new(None);
let subscription = syscalls::subscribe::<callback::Identity0Consumer, _>( let recv_amount = Cell::new(None);
let mut callback = |result, amount| {
result_code.set(Some(result));
recv_amount.set(Some(amount));
done.set(true)
};
let subscription = syscalls::subscribe::<callback::Identity2Consumer, _>(
DRIVER_NUMBER, DRIVER_NUMBER,
subscribe_nr::RECEIVE, subscribe_nr::RECEIVE,
&mut alarm, &mut callback,
); )?;
if subscription.is_err() { syscalls::command(DRIVER_NUMBER, command_nr::RECEIVE, 0, 0)?;
return TransOrRecvStatus::Error;
}
let result_code =
unsafe { syscalls::raw::command(DRIVER_NUMBER, command_nr::RECEIVE, 0, 0) };
match result_code {
SUCCESS => (),
ENOMEM => return TransOrRecvStatus::OOM,
_ => return TransOrRecvStatus::Error,
}
util::yieldk_for(|| done.get()); util::yieldk_for(|| done.get());
TransOrRecvStatus::Success mem::drop(subscription);
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.
/// 2. Subscribe to having a successful transmission callback. /// 2. Subscribe to having a successful transmission callback.
/// 3. Issue the request for transmitting. /// 3. Issue the request for transmitting.
pub fn transmit(buf: &mut [u8], amount: usize) -> TransOrRecvStatus { pub fn transmit(buf: &mut [u8], amount: usize) -> Result<usize, TockError> {
let result = syscalls::allow(DRIVER_NUMBER, allow_nr::TRANSMIT, buf); let result = syscalls::allow(DRIVER_NUMBER, allow_nr::TRANSMIT, buf)?;
if result.is_err() { // set callback with 1 argument, to receive ReturnCode
return TransOrRecvStatus::InvalidBuffer;
}
let done = Cell::new(false); let done = Cell::new(false);
let mut alarm = || done.set(true); let result_code = Cell::new(None);
let subscription = syscalls::subscribe::<callback::Identity0Consumer, _>( let mut callback = |result| {
result_code.set(Some(result));
done.set(true)
};
let subscription = syscalls::subscribe::<callback::Identity1Consumer, _>(
DRIVER_NUMBER, DRIVER_NUMBER,
subscribe_nr::TRANSMIT, subscribe_nr::TRANSMIT,
&mut alarm, &mut callback,
); )?;
if subscription.is_err() { syscalls::command(DRIVER_NUMBER, command_nr::TRANSMIT, amount, 0)?;
return TransOrRecvStatus::Error;
}
let result_code = syscalls::command(DRIVER_NUMBER, command_nr::TRANSMIT, amount, 0);
if result_code.is_err() {
return TransOrRecvStatus::Error;
}
util::yieldk_for(|| done.get()); util::yieldk_for(|| done.get());
TransOrRecvStatus::Success mem::drop(subscription);
mem::drop(result);
Ok(result_code.get().unwrap())
} }
} }