diff --git a/src/constants.rs b/src/constants.rs index e862a5a..81f6332 100644 --- a/src/constants.rs +++ b/src/constants.rs @@ -10,11 +10,7 @@ pub type PACKET_SIZE_TYPE = consts::U512; #[cfg(not(feature = "highspeed-usb"))] pub type PACKET_SIZE_TYPE = consts::U64; -// size?? -pub type EXT_PACKET_SIZE_TYPE = consts::U384; - pub const PACKET_SIZE: usize = PACKET_SIZE_TYPE::USIZE; -pub const EXT_PACKET_SIZE: usize = EXT_PACKET_SIZE_TYPE::USIZE; pub const CLASS_CCID: u8 = 0x0B; pub const SUBCLASS_NONE: u8 = 0x0; diff --git a/src/types/packet.rs b/src/types/packet.rs index 5ce2b79..2db1be9 100644 --- a/src/types/packet.rs +++ b/src/types/packet.rs @@ -4,7 +4,7 @@ use crate::constants::*; pub type RawPacket = heapless::ByteBuf; -pub type ExtPacket = heapless::ByteBuf; +pub type ExtPacket = heapless::ByteBuf; pub trait RawPacketExt { fn packet_len(&self) -> usize; @@ -47,7 +47,7 @@ pub trait PacketWithData: Packet { // let len = u32::from_le_bytes(self[1..5].try_into().unwrap()) as usize; let declared_len = u32::from_le_bytes(self[1..5].try_into().unwrap()) as usize; - let len = core::cmp::min(EXT_PACKET_SIZE - 10, declared_len); + let len = core::cmp::min(MAX_MSG_LENGTH - 10, declared_len); // hprintln!("delcared = {}, len = {}", declared_len, len).ok(); &self[10..][..len] }