catarrh/simtrace2
1
0
Fork 0
mirror of https://gitea.osmocom.org/sim-card/simtrace2.git synced 2026-03-16 21:28:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Cosmetic: fix CI errors

Browse Source 
* Fix UTF-8 encoding. This caused the endianness check to fail, which
  reads all .c and .h files.

* Add .checkpatch.conf to skip linting for:
  firmware/atmel_softpack_libraries

Change-Id: Ibb2e42e9b4307275a33e4000c201847a6bd60137
This commit is contained in:
Oliver Smith
2023-04-25 17:24:19 +02:00
parent 773d314142
commit 6778c3f46e
6 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.checkpatch.conf Normal file
View File

@@ -0,0 +1 @@
--exclude ^firmware/atmel_softpack_libraries/.*$

2
firmware/atmel_softpack_libraries/libchip_sam3s/chip.h
View File

@@ -15,7 +15,7 @@
/* Define attribute */ /* Define attribute */
#if defined ( __CC_ARM ) /* Keil µVision 4 */ #if defined ( __CC_ARM ) /* Keil µVision 4 */
#define WEAK __attribute__ ((weak)) #define WEAK __attribute__ ((weak))
#elif defined ( __ICCARM__ ) /* IAR Ewarm 5.41+ */ #elif defined ( __ICCARM__ ) /* IAR Ewarm 5.41+ */
#define WEAK __weak #define WEAK __weak

2
firmware/atmel_softpack_libraries/usb/include/USBD.h
View File

@@ -63,7 +63,7 @@
*------------------------------------------------------------------------------*/ *------------------------------------------------------------------------------*/
/* Define attribute */ /* Define attribute */
#if defined ( __CC_ARM ) /* Keil µVision 4 */ #if defined ( __CC_ARM ) /* Keil µVision 4 */
#define WEAK __attribute__ ((weak)) #define WEAK __attribute__ ((weak))
#elif defined ( __ICCARM__ ) /* IAR Ewarm 5.41+ */ #elif defined ( __ICCARM__ ) /* IAR Ewarm 5.41+ */
#define WEAK __weak #define WEAK __weak

2
firmware/atmel_softpack_libraries/usb/include/USBDescriptors.h
View File

@@ -296,7 +296,7 @@ typedef uint32_t (*USBDescriptorParseFunction)(void *descriptor, void *parseArg)
*/ */
#pragma pack(1) #pragma pack(1)
#if defined ( __CC_ARM ) /* Keil µVision 4 */ #if defined ( __CC_ARM ) /* Keil µVision 4 */
#elif defined ( __ICCARM__ ) /* IAR Ewarm 5.41+ */ #elif defined ( __ICCARM__ ) /* IAR Ewarm 5.41+ */
#define __attribute__(...) #define __attribute__(...)
#elif defined ( __GNUC__ ) /* GCC CS3 2009q3-68 */ #elif defined ( __GNUC__ ) /* GCC CS3 2009q3-68 */

28
firmware/libcommon/include/cciddriver.h
View File

@@ -175,11 +175,11 @@ typedef struct
{ {
/// Number of seconds. If 00h then CCID default value is used. /// Number of seconds. If 00h then CCID default value is used.
unsigned char bTimeOut; unsigned char bTimeOut;
/// Several parameters for the PIN format options (defined in § 6.1.11.4) /// Several parameters for the PIN format options (defined in § 6.1.11.4)
unsigned char bmFormatString4; unsigned char bmFormatString4;
/// Define the length of the PIN to present in the APDU command /// Define the length of the PIN to present in the APDU command
unsigned char bmPINBlockString; unsigned char bmPINBlockString;
/// Allows the length PIN insertion in the APDU command (defined in § 6.1.11.6) /// Allows the length PIN insertion in the APDU command (defined in § 6.1.11.6)
unsigned char bmPinLengthFormat; unsigned char bmPinLengthFormat;
/// Insertion position offset in byte for the current PIN /// Insertion position offset in byte for the current PIN
unsigned char bInsertionOffsetOld; unsigned char bInsertionOffsetOld;
@@ -218,13 +218,13 @@ typedef struct
/// Protocol Data Structure for Protocol T=0 (bProtocolNum=0, dwLength=00000005h) /// Protocol Data Structure for Protocol T=0 (bProtocolNum=0, dwLength=00000005h)
typedef struct typedef struct
{ {
/// B7-4 – FI – Index into the table 7 in ISO/IEC 7816-3:1997 selecting a /// B7-4 - FI - Index into the table 7 in ISO/IEC 7816-3:1997 selecting a
/// clock rate conversion factor /// clock rate conversion factor
/// B3-0 – DI - Index into the table 8 in ISO/IEC 7816-3:1997 selecting a /// B3-0 - DI - Index into the table 8 in ISO/IEC 7816-3:1997 selecting a
/// baud rate conversion factor /// baud rate conversion factor
unsigned char bmFindexDindex; unsigned char bmFindexDindex;
/// For T=0 ,B0 – 0b, B7-2 – 000000b /// For T=0 ,B0 - 0b, B7-2 - 000000b
/// B1 – Convention used (b1=0 for direct, b1=1 for inverse) /// B1 - Convention used (b1=0 for direct, b1=1 for inverse)
unsigned char bmTCCKST0; // 0 to 2 unsigned char bmTCCKST0; // 0 to 2
/// Extra Guardtime between two characters. Add 0 to 254 etu to the normal /// Extra Guardtime between two characters. Add 0 to 254 etu to the normal
/// guardtime of 12etu. FFh is the same as 00h. /// guardtime of 12etu. FFh is the same as 00h.
@@ -243,14 +243,14 @@ typedef struct
/// Protocol Data Structure for Protocol T=1 (bProtocolNum=1, dwLength=00000007h) /// Protocol Data Structure for Protocol T=1 (bProtocolNum=1, dwLength=00000007h)
typedef struct typedef struct
{ {
/// B7-4 – FI – Index into the table 7 in ISO/IEC 7816-3:1997 selecting a /// B7-4 - FI - Index into the table 7 in ISO/IEC 7816-3:1997 selecting a
/// clock rate conversion factor /// clock rate conversion factor
/// B3-0 – DI - Index into the table 8 in ISO/IEC 7816-3:1997 selecting a /// B3-0 - DI - Index into the table 8 in ISO/IEC 7816-3:1997 selecting a
/// baud rate conversion factor /// baud rate conversion factor
unsigned char bmFindexDindex; unsigned char bmFindexDindex;
/// For T=1, B7-2 – 000100b /// For T=1, B7-2 - 000100b
/// B0 – Checksum type (b0=0 for LRC, b0=1 for CRC /// B0 - Checksum type (b0=0 for LRC, b0=1 for CRC
/// B1 – Convention used (b1=0 for direct, b1=1 for inverse) /// B1 - Convention used (b1=0 for direct, b1=1 for inverse)
unsigned char bmTCCKST1; // 10h, 11h, 12h, 13h unsigned char bmTCCKST1; // 10h, 11h, 12h, 13h
/// Extra Guardtime (0 to 254 etu between two characters). /// Extra Guardtime (0 to 254 etu between two characters).
/// If value is FFh, then guardtime is reduced by 1. /// If value is FFh, then guardtime is reduced by 1.
@@ -292,8 +292,8 @@ typedef struct
/// - 04h 1.8V /// - 04h 1.8V
/// Other bits are RFU. /// Other bits are RFU.
unsigned char bVoltageSupport; unsigned char bVoltageSupport;
/// RRRR –Upper Word- is RFU = 0000h /// RRRR -Upper Word- is RFU = 0000h
/// PPPP –Lower Word- Encodes the supported protocol types. A ‘1’ in a given /// PPPP -Lower Word- Encodes the supported protocol types. A "1" in a given
/// bit position indicates support for the associated ISO protocol. /// bit position indicates support for the associated ISO protocol.
/// 0001h = Protocol T=0 /// 0001h = Protocol T=0
/// 0002h = Protocol T=1 /// 0002h = Protocol T=1
@@ -318,7 +318,7 @@ typedef struct
/// Indicates the maximum IFSD supported by CCID for protocol T=1. /// Indicates the maximum IFSD supported by CCID for protocol T=1.
unsigned long dwMaxIFSD; unsigned long dwMaxIFSD;
/// - RRRR-Upper Word- is RFU = 0000h /// - RRRR-Upper Word- is RFU = 0000h
/// - PPPP-Lower Word- encodes the supported protocol types. A ‘1’ in a given /// - PPPP-Lower Word- encodes the supported protocol types. A "1" in a given
/// bit position indicates support for the associated protocol. /// bit position indicates support for the associated protocol.
/// 0001h indicates support for the 2-wire protocol 1 /// 0001h indicates support for the 2-wire protocol 1
/// 0002h indicates support for the 3-wire protocol 1 /// 0002h indicates support for the 3-wire protocol 1

6
firmware/libcommon/source/cciddriver.c
View File

@@ -193,8 +193,8 @@ static void RDRtoPCDatablock_ATR( void )
ccidDriver.ProtocolDataStructure[0] = Atr[2]; // TA(1) ccidDriver.ProtocolDataStructure[0] = Atr[2]; // TA(1)
// bmTCCKST0 // bmTCCKST0
// For T=0 ,B0 – 0b, B7-2 – 000000b // For T=0 ,B0 - 0b, B7-2 - 000000b
// B1 – Convention used (b1=0 for direct, b1=1 for inverse) // B1 - Convention used (b1=0 for direct, b1=1 for inverse)
// bGuardTimeT0 // bGuardTimeT0
// Extra Guardtime between two characters. Add 0 to 254 etu to the normal // Extra Guardtime between two characters. Add 0 to 254 etu to the normal
@@ -1005,7 +1005,7 @@ unsigned char CCID_Removal( void )
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
/// Interrupt-IN Messages /// Interrupt-IN Messages
/// This message is sent when any bit in the bHardwareErrorCode field is set. /// This message is sent when any bit in the bHardwareErrorCode field is set.
/// If this message is sent when there is no “outstanding” command, the bSeq /// If this message is sent when there is no "outstanding" command, the bSeq
/// field will be undefined. /// field will be undefined.
/// \param bSlot ICC slot number /// \param bSlot ICC slot number
/// \param bSeq Sequence number of the bulk OUT command when the hardware error /// \param bSeq Sequence number of the bulk OUT command when the hardware error