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

use max msg length for ext packet

Browse Source
This commit is contained in:
Conor Patrick
2020-07-11 14:34:32 +02:00
committed by Nicolas Stalder
parent e7f9c05ee7
commit 0da6097427
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/constants.rs
-4
View File
@@ -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;
src/types/packet.rs
+2 -2
View File
@@ -4,7 +4,7 @@ use crate::constants::*;
pub type RawPacket = heapless::ByteBuf<PACKET_SIZE_TYPE>;
pub type ExtPacket = heapless::ByteBuf<EXT_PACKET_SIZE_TYPE>;
pub type ExtPacket = heapless::ByteBuf<MAX_MSG_LENGTH_TYPE>;
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]
}