From 00ab3c8877a91f23ae72fb981063308adb5b52b7 Mon Sep 17 00:00:00 2001 From: Mirna Date: Mon, 12 Oct 2020 16:01:22 +0200 Subject: [PATCH] Fixes for some unsuccessful checks --- examples/nfct_test.rs | 14 ++++++++------ third_party/libtock-drivers/src/lib.rs | 2 +- third_party/libtock-drivers/src/nfc.rs | 14 ++------------ 3 files changed, 11 insertions(+), 19 deletions(-) diff --git a/examples/nfct_test.rs b/examples/nfct_test.rs index 900bcd7..1432dfd 100644 --- a/examples/nfct_test.rs +++ b/examples/nfct_test.rs @@ -1,9 +1,11 @@ +extern crate alloc; extern crate lang_items; +use core::fmt::Write; use libtock_drivers::console::Console; -use libtock_drivers::nfc; +// use libtock_drivers::nfc; -fn main(){ +fn main() { let mut console = Console::new(); writeln!(console, "****************************************").unwrap(); @@ -14,9 +16,9 @@ fn main(){ // 2. Configure Type 4 tag // [_.] Enable Tag emulation (currently the tag is always activated) // loop { - // 1. Allow Receive Buffer - // 2. Subscribe to RECEIVE CALLBACK - // 3. Allow TX buffer - // 4. Subscribe to TX CALLBACK + // 1. Allow Receive Buffer + // 2. Subscribe to RECEIVE CALLBACK + // 3. Allow TX buffer + // 4. Subscribe to TX CALLBACK // } } diff --git a/third_party/libtock-drivers/src/lib.rs b/third_party/libtock-drivers/src/lib.rs index e498a37..ec8a2d7 100644 --- a/third_party/libtock-drivers/src/lib.rs +++ b/third_party/libtock-drivers/src/lib.rs @@ -3,9 +3,9 @@ pub mod buttons; pub mod console; pub mod led; +pub mod nfc; pub mod result; pub mod rng; pub mod timer; pub mod usb_ctap_hid; pub mod util; -pub mod nfc; diff --git a/third_party/libtock-drivers/src/nfc.rs b/third_party/libtock-drivers/src/nfc.rs index 9fa950c..977b49b 100644 --- a/third_party/libtock-drivers/src/nfc.rs +++ b/third_party/libtock-drivers/src/nfc.rs @@ -31,12 +31,7 @@ pub fn disable_emulation() { } pub fn emulate(enabled: bool) -> bool { - let result_code = syscalls::command( - DRIVER_NUMBER, - command_nr::EMULATE, - enabled as usize, - 0 - ); + let result_code = syscalls::command(DRIVER_NUMBER, command_nr::EMULATE, enabled as usize, 0); if result_code.is_err() { return false; } @@ -61,12 +56,7 @@ pub fn selected() -> bool { } pub fn configure(tag_type: u8) -> bool { - let result_code = syscalls::command( - DRIVER_NUMBER, - command_nr::CONFIGURE, - tag_type as usize, - 0 - ); + let result_code = syscalls::command(DRIVER_NUMBER, command_nr::CONFIGURE, tag_type as usize, 0); if result_code.is_err() { return false; }