trussed/usbd-ccid
0
0
Fork 0
mirror of https://github.com/trussed-dev/usbd-ccid.git synced 2026-06-20 04:16:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

substitute all uses of semihosting and funnel with logging crate

Browse Source
This commit is contained in:
Conor Patrick
2020-08-23 14:36:29 +02:00
committed by Nicolas Stalder
parent 0da6097427
commit 67268f6337
4 changed files with 46 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.toml
+12 -4
View File
@@ -8,18 +8,26 @@ edition = "2018"
[dependencies]
asn1derpy = "0.1.0"
cortex-m-semihosting = { version = "0.3.5", optional = true}
heapless = "0.5.5"
heapless-bytes = { git = "https://github.com/ycrypto/heapless-bytes", branch = "main" }
# heapless-bytes = { path = "../../../heapless-bytes" }
interchange = { path = "../interchange" }
logging = { package = "logging", path = "../logging",version = "0.1.0" }
# logging-ccid = { package = "logging", path = "../logging",version = "0.1.0" }
iso7816 = { path = "../iso7816" }
untrusted = "0.7.1"
usb-device = { version = "0.2.3", features = ["control-buffer-256"] }
[features]
default = [
"cortex-m-semihosting",
]
default = []
highspeed-usb = []
log-all = []
log-none = []
log-info = []
log-debug = []
log-warn = []
log-error = []
src/class.rs
+4 -4
View File
@@ -1,6 +1,6 @@
use core::convert::TryFrom;
use cortex_m_semihosting::hprintln;
use crate::logger::{blocking};
use interchange::Requester;
use crate::{
@@ -77,7 +77,7 @@ where
}
fn poll(&mut self) {
// hprintln!("poll of ccid").ok();
// blocking::info!("poll of ccid").ok();
self.pipe.poll_app();
self.pipe.maybe_send_packet();
}
@@ -134,7 +134,7 @@ where
}
Err(()) => {
hprintln!("unexpected request: {}", request).ok();
blocking::info!("unexpected request: {}", request).ok();
}
}
}
@@ -167,7 +167,7 @@ where
}
Err(()) => {
hprintln!("unexpected request: {}", request).ok();
blocking::info!("unexpected request: {}", request).ok();
}
}
}
src/lib.rs
+2
View File
@@ -15,3 +15,5 @@ pub mod types;
// pub mod piv;
pub use class::Ccid;
logging::add!(logger);
src/pipe.rs
+28 -28
View File
@@ -1,7 +1,7 @@
use core::convert::TryFrom;
use cortex_m_semihosting::hprintln;
use interchange::Requester;
use crate::logger::{blocking};
use crate::{
constants::*,
@@ -133,20 +133,20 @@ where
if self.long_packet_missing > 0 {
return;
} else {
// hprintln!("pl {}, p {}, missing {}, in_chain {}", self.packet_len, packet.len(), self.long_packet_missing, self.in_chain).ok();
// hprintln!("packet: {:X?}", &self.ext_packet).ok();
// blocking::info!("pl {}, p {}, missing {}, in_chain {}", self.packet_len, packet.len(), self.long_packet_missing, self.in_chain).ok();
// blocking::info!("packet: {:X?}", &self.ext_packet).ok();
self.receiving_long = false;
}
}
// hprintln!("handle packet").ok();
// hprintln!("{:X?}", &packet).ok();
// blocking::info!("handle packet").ok();
// blocking::info!("{:X?}", &packet).ok();
// let p = packet.clone();
// match PacketCommand::try_from(packet) {
match PacketCommand::try_from(self.ext_packet.clone()) {
Ok(command) => {
self.seq = command.seq();
// hprintln!("{:?}", &command).ok();
// blocking::info!("{:?}", &command).ok();
// happy path
match command {
@@ -169,7 +169,7 @@ where
}
Err(PacketError::UnknownCommand(_c)) => {
// hprintln!("{:X?}", &p).ok();
// blocking::info!("{:X?}", &p).ok();
// panic!("unknown command byte 0x{:x}", c);
}
@@ -182,15 +182,15 @@ where
//
// conts: BeginsAndEnds, Begins, Ends, Continues, ExpectDataBlock,
// hprintln!("handle xfrblock").ok();
// hprintln!("{:X?}", &command).ok();
// blocking::info!("handle xfrblock").ok();
// blocking::info!("{:X?}", &command).ok();
match self.state {
State::Idle => {
// invariant: BUFFER_SIZE >= PACKET_SIZE
match command.chain() {
Chain::BeginsAndEnds => {
hprintln!("begins and ends").ok();
blocking::info!("begins and ends").ok();
self.message.clear();
self.message.extend_from_slice(command.data()).unwrap();
self.call_app();
@@ -198,7 +198,7 @@ where
// self.send_empty_datablock();
}
Chain::Begins => {
hprintln!("begins").ok();
blocking::info!("begins").ok();
self.message.clear();
self.message.extend_from_slice(command.data()).unwrap();
self.state = State::Receiving;
@@ -211,13 +211,13 @@ where
State::Receiving => {
match command.chain() {
Chain::Continues => {
hprintln!("continues").ok();
blocking::info!("continues").ok();
assert!(command.data().len() + self.message.len() <= MAX_MSG_LENGTH);
self.message.extend_from_slice(command.data()).unwrap();
self.send_empty_datablock(Chain::ExpectingMore);
}
Chain::Ends => {
hprintln!("ends").ok();
blocking::info!("ends").ok();
assert!(command.data().len() + self.message.len() <= MAX_MSG_LENGTH);
self.message.extend_from_slice(command.data()).unwrap();
self.call_app();
@@ -228,8 +228,8 @@ where
}
State::Processing => {
// hprintln!("handle xfrblock").ok();
// hprintln!("{:X?}", &command).ok();
// blocking::info!("handle xfrblock").ok();
// blocking::info!("{:X?}", &command).ok();
panic!("ccid pipe unexpectedly received command while in processing state: {:?}", &command);
}
@@ -249,19 +249,19 @@ where
}
fn call_app(&mut self) {
hprintln!("called piv app").ok();
blocking::info!("called piv app").ok();
let command = match iso7816::Command::try_from(&self.message) {
Ok(command) => command,
Err(_error) => {
hprintln!("could not parse command from APDU, ignoring {:?}", &self.message).ok();
hprintln!("{:?}", &_error).ok();
blocking::info!("could not parse command from APDU, ignoring {:?}", &self.message).ok();
blocking::info!("{:?}", &_error).ok();
return;
}
};
self.interchange.request(command).expect("could not deposit command");
// apdu::Command::try_from(&self.message).unwrap()
// ).expect("could not deposit command");
// hprintln!("set ccid state to processing").ok();
// blocking::info!("set ccid state to processing").ok();
self.state = State::Processing;
// todo!("have message of length {} to dispatch", self.message.len());
}
@@ -272,11 +272,11 @@ where
// if i < 100 {
// i += 1;
// } else {
// hprintln!(".").ok();
// blocking::info!(".").ok();
// }
// }
if let State::Processing = self.state {
// hprintln!("processing, checking for response, interchange state {:?}",
// blocking::info!("processing, checking for response, interchange state {:?}",
// self.interchange.state()).ok();
if let Some(response) = self.interchange.take_response() {
@@ -314,7 +314,7 @@ where
};
let primed_packet = DataBlock::new(self.seq, chain, chunk);
// hprintln!("priming {:?}", &primed_packet).ok();
// blocking::info!("priming {:?}", &primed_packet).ok();
self.outbox = Some(primed_packet.into());
// fast-lane response attempt
@@ -412,13 +412,13 @@ where
match self.write.write(packet) {
Ok(n) if n == packet.len() => {
// if packet.len() > 8 {
// hprintln!("--> sent {:?}... successfully", &packet[..8]).ok();
// blocking::info!("--> sent {:?}... successfully", &packet[..8]).ok();
// } else {
// hprintln!("--> sent {:?} successfully", packet).ok();
// blocking::info!("--> sent {:?} successfully", packet).ok();
// }
if needs_zlp {
// hprintln!("sending ZLP").ok();
// blocking::info!("sending ZLP").ok();
self.outbox = Some(RawPacket::new());
} else {
self.outbox = None;
@@ -430,7 +430,7 @@ where
Err(UsbError::WouldBlock) => {
// fine, can't write try later
// this shouldn't happen probably
hprintln!("waiting to send").ok();
blocking::info!("waiting to send").ok();
},
Err(_) => panic!("unexpected send error"),
@@ -446,9 +446,9 @@ where
// self.write.address()
// }
pub fn expect_abort(&mut self, slot: u8, seq: u8) {
pub fn expect_abort(&mut self, slot: u8, _seq: u8) {
debug_assert!(slot == 0);
hprintln!("ABORT expected for seq = {}", seq).ok();
blocking::info!("ABORT expected for seq = {}", _seq).ok();
todo!();
}