Skip to content

Commit 6778c3f

Browse files
committed
Cosmetic: fix CI errors
* 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
1 parent 773d314 commit 6778c3f

File tree

6 files changed

+21
-20
lines changed

6 files changed

+21
-20
lines changed

.checkpatch.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
--exclude ^firmware/atmel_softpack_libraries/.*$

firmware/atmel_softpack_libraries/libchip_sam3s/chip.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616

1717
/* Define attribute */
18-
#if defined ( __CC_ARM ) /* Keil µVision 4 */
18+
#if defined ( __CC_ARM ) /* Keil µVision 4 */
1919
#define WEAK __attribute__ ((weak))
2020
#elif defined ( __ICCARM__ ) /* IAR Ewarm 5.41+ */
2121
#define WEAK __weak

firmware/atmel_softpack_libraries/usb/include/USBD.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
*------------------------------------------------------------------------------*/
6464

6565
/* Define attribute */
66-
#if defined ( __CC_ARM ) /* Keil µVision 4 */
66+
#if defined ( __CC_ARM ) /* Keil µVision 4 */
6767
#define WEAK __attribute__ ((weak))
6868
#elif defined ( __ICCARM__ ) /* IAR Ewarm 5.41+ */
6969
#define WEAK __weak

firmware/atmel_softpack_libraries/usb/include/USBDescriptors.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ typedef uint32_t (*USBDescriptorParseFunction)(void *descriptor, void *parseArg)
296296
*/
297297
#pragma pack(1)
298298

299-
#if defined ( __CC_ARM ) /* Keil µVision 4 */
299+
#if defined ( __CC_ARM ) /* Keil µVision 4 */
300300
#elif defined ( __ICCARM__ ) /* IAR Ewarm 5.41+ */
301301
#define __attribute__(...)
302302
#elif defined ( __GNUC__ ) /* GCC CS3 2009q3-68 */

firmware/libcommon/include/cciddriver.h

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -175,11 +175,11 @@ typedef struct
175175
{
176176
/// Number of seconds. If 00h then CCID default value is used.
177177
unsigned char bTimeOut;
178-
/// Several parameters for the PIN format options (defined in § 6.1.11.4)
178+
/// Several parameters for the PIN format options (defined in § 6.1.11.4)
179179
unsigned char bmFormatString4;
180180
/// Define the length of the PIN to present in the APDU command
181181
unsigned char bmPINBlockString;
182-
/// Allows the length PIN insertion in the APDU command (defined in § 6.1.11.6)
182+
/// Allows the length PIN insertion in the APDU command (defined in § 6.1.11.6)
183183
unsigned char bmPinLengthFormat;
184184
/// Insertion position offset in byte for the current PIN
185185
unsigned char bInsertionOffsetOld;
@@ -218,13 +218,13 @@ typedef struct
218218
/// Protocol Data Structure for Protocol T=0 (bProtocolNum=0, dwLength=00000005h)
219219
typedef struct
220220
{
221-
/// B7-4 – FI – Index into the table 7 in ISO/IEC 7816-3:1997 selecting a
221+
/// B7-4 - FI - Index into the table 7 in ISO/IEC 7816-3:1997 selecting a
222222
/// clock rate conversion factor
223-
/// B3-0 – DI - Index into the table 8 in ISO/IEC 7816-3:1997 selecting a
223+
/// B3-0 - DI - Index into the table 8 in ISO/IEC 7816-3:1997 selecting a
224224
/// baud rate conversion factor
225225
unsigned char bmFindexDindex;
226-
/// For T=0 ,B0 – 0b, B7-2 – 000000b
227-
/// B1 – Convention used (b1=0 for direct, b1=1 for inverse)
226+
/// For T=0 ,B0 - 0b, B7-2 - 000000b
227+
/// B1 - Convention used (b1=0 for direct, b1=1 for inverse)
228228
unsigned char bmTCCKST0; // 0 to 2
229229
/// Extra Guardtime between two characters. Add 0 to 254 etu to the normal
230230
/// guardtime of 12etu. FFh is the same as 00h.
@@ -243,14 +243,14 @@ typedef struct
243243
/// Protocol Data Structure for Protocol T=1 (bProtocolNum=1, dwLength=00000007h)
244244
typedef struct
245245
{
246-
/// B7-4 – FI – Index into the table 7 in ISO/IEC 7816-3:1997 selecting a
246+
/// B7-4 - FI - Index into the table 7 in ISO/IEC 7816-3:1997 selecting a
247247
/// clock rate conversion factor
248-
/// B3-0 – DI - Index into the table 8 in ISO/IEC 7816-3:1997 selecting a
248+
/// B3-0 - DI - Index into the table 8 in ISO/IEC 7816-3:1997 selecting a
249249
/// baud rate conversion factor
250250
unsigned char bmFindexDindex;
251-
/// For T=1, B7-2 – 000100b
252-
/// B0 – Checksum type (b0=0 for LRC, b0=1 for CRC
253-
/// B1 – Convention used (b1=0 for direct, b1=1 for inverse)
251+
/// For T=1, B7-2 - 000100b
252+
/// B0 - Checksum type (b0=0 for LRC, b0=1 for CRC
253+
/// B1 - Convention used (b1=0 for direct, b1=1 for inverse)
254254
unsigned char bmTCCKST1; // 10h, 11h, 12h, 13h
255255
/// Extra Guardtime (0 to 254 etu between two characters).
256256
/// If value is FFh, then guardtime is reduced by 1.
@@ -292,8 +292,8 @@ typedef struct
292292
/// - 04h 1.8V
293293
/// Other bits are RFU.
294294
unsigned char bVoltageSupport;
295-
/// RRRR –Upper Word- is RFU = 0000h
296-
/// PPPP –Lower Word- Encodes the supported protocol types. A ‘1’ in a given
295+
/// RRRR -Upper Word- is RFU = 0000h
296+
/// PPPP -Lower Word- Encodes the supported protocol types. A "1" in a given
297297
/// bit position indicates support for the associated ISO protocol.
298298
/// 0001h = Protocol T=0
299299
/// 0002h = Protocol T=1
@@ -318,7 +318,7 @@ typedef struct
318318
/// Indicates the maximum IFSD supported by CCID for protocol T=1.
319319
unsigned long dwMaxIFSD;
320320
/// - RRRR-Upper Word- is RFU = 0000h
321-
/// - PPPP-Lower Word- encodes the supported protocol types. A ‘1’ in a given
321+
/// - PPPP-Lower Word- encodes the supported protocol types. A "1" in a given
322322
/// bit position indicates support for the associated protocol.
323323
/// 0001h indicates support for the 2-wire protocol 1
324324
/// 0002h indicates support for the 3-wire protocol 1

firmware/libcommon/source/cciddriver.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,8 @@ static void RDRtoPCDatablock_ATR( void )
193193
ccidDriver.ProtocolDataStructure[0] = Atr[2]; // TA(1)
194194

195195
// bmTCCKST0
196-
// For T=0 ,B0 0b, B7-2 000000b
197-
// B1 Convention used (b1=0 for direct, b1=1 for inverse)
196+
// For T=0 ,B0 - 0b, B7-2 - 000000b
197+
// B1 - Convention used (b1=0 for direct, b1=1 for inverse)
198198

199199
// bGuardTimeT0
200200
// Extra Guardtime between two characters. Add 0 to 254 etu to the normal
@@ -1005,7 +1005,7 @@ unsigned char CCID_Removal( void )
10051005
//------------------------------------------------------------------------------
10061006
/// Interrupt-IN Messages
10071007
/// This message is sent when any bit in the bHardwareErrorCode field is set.
1008-
/// If this message is sent when there is no outstanding command, the bSeq
1008+
/// If this message is sent when there is no "outstanding" command, the bSeq
10091009
/// field will be undefined.
10101010
/// \param bSlot ICC slot number
10111011
/// \param bSeq Sequence number of the bulk OUT command when the hardware error

0 commit comments

Comments
 (0)