CCID_TypeS: Use little-endian 16/32bit integer types

This commit is contained in:
Harald Welte 2019-01-14 22:46:01 +01:00
parent 296b3d3825
commit 5a35beb80b
2 changed files with 16 additions and 14 deletions

View File

@ -2,6 +2,7 @@ module CCID_Types {
import from General_Types all;
import from Osmocom_Types all;
import from USB_Types all;
/* TTCN-3 data types with TITAN RAW codec annotations for USB CCID
* "Universal Serial Bus - Device Class: Smart Cad - CCID - Specification
@ -74,19 +75,19 @@ type record CCID_ClassDescriptor {
uint8_t bMaxSlotIndex,
CCID_VoltageSupport bVoltageSupport,
CCID_Protocols dwProtocools,
uint32_t dwDefaultClock,
uint32_t dwMaximumClock,
u32le_t dwDefaultClock,
u32le_t dwMaximumClock,
uint8_t bNumClockSupported,
uint32_t dwDataRate,
uint32_t dwMaxDataRate,
u32le_t dwDataRate,
u32le_t dwMaxDataRate,
uint8_t bNumDataRatesSupported,
uint32_t dwMaxIFSD,
u32le_t dwMaxIFSD,
CCID_Mechanical dwMechanical,
CCID_Features dwFeatures,
uint32_t dwMaxCCIDMessageLength,
u32le_t dwMaxCCIDMessageLength,
uint8_t bClassGetResponse,
uint8_t bClassEnvelope,
uint16_t wLcdLayout,
u16le_t wLcdLayout,
uint8_t bPINSupport,
uint8_t bMaxCCIDBusySlots
};
@ -123,7 +124,7 @@ type record CCID_PC_to_RDR_GetSlotStatus {
/* Section 6.1.4 */
type record CCID_PC_to_RDR_XfrBlock {
uint8_t bBWI,
uint16_t wLevelParameter,
u16le_t wLevelParameter,
octetstring abData
};
@ -203,7 +204,7 @@ type record CCID_PC_to_RDR_T0APDU {
/* Section 6.1.11 */
type record CCID_PC_to_RDR_Secure {
uint8_t bBWI,
uint16_t wLevelParameter,
u16le_t wLevelParameter,
octetstring abData
};
@ -228,8 +229,8 @@ type record CCID_PC_to_RDR_Abort {
/* Section 6.1.14 */
type record CCID_PC_to_RDR_SetRateAndClock {
OCT3 abRFU,
uint32_t dwClockFrequency,
uint32_t dwDataRate
u32le_t dwClockFrequency,
u32le_t dwDataRate
};
/***********************************************************************
@ -267,8 +268,8 @@ type record CCID_RDR_to_PC_Escape {
/* Section 6.2.5 */
type record CCID_RDR_to_PC_DataRateAndClock {
OCT1 bRFU,
uint32_t dwClockAndFrequency,
uint32_t dwDataRate
u32le_t dwClockFrequency,
u32le_t dwDataRate
};
/* Section 6.2.6 */
@ -327,7 +328,7 @@ type enumerated CCID_MsgType {
type record CCID_Header {
CCID_MsgType bMessageType,
uint32_t dwLength,
u32le_t dwLength,
uint8_t bSlot,
uint8_t bSeq
};

View File

@ -7,6 +7,7 @@ import from Osmocom_Types all;
type hexstring HEX4LE length(4) with { variant "BYTEORDER(last)" variant "HEXORDER(high)" };
type integer u16le_t (0..65535) with { variant "unsigned 16 bit" variant "BYTEORDER(first)" };
type integer u32le_t (0..4294967295) with { variant "unsigned 32 bit" variant "BYTEORDER(first)" };
/* Chapter 9.3 */
type enumerated USB_RequestType_Direction {