Changeset 11478 for trunk/reader-common.h

Timestamp:

01/18/19 23:36:20 (2 years ago)

Author:

Gorgone Impertinence

Message:

big cleanup pack 4

File:

• trunk/reader-common.h (modified) (2 diffs)

trunk/reader-common.h

@@ -11 +11 @@
 #include "oscam-reader.h"
 
-int32_t reader_cmd2icc(struct s_reader *reader, const uchar *buf, const int32_t l, uchar *response, uint16_t *response_length);
-int32_t card_write(struct s_reader *reader, const uchar *, const uchar *, uchar *, uint16_t *);
+int32_t reader_cmd2icc(struct s_reader *reader, const uint8_t *buf, const int32_t l, uint8_t *response, uint16_t *response_length);
+int32_t card_write(struct s_reader *reader, const uint8_t *, const uint8_t *, uint8_t *, uint16_t *);
 
 #define write_cmd(cmd, data) \
-    { \
-        if (card_write(reader, cmd, data, cta_res, &cta_lr)) return ERROR; \
-    }
+    { \
+        if (card_write(reader, cmd, data, cta_res, &cta_lr)) return ERROR; \
+    }
 
 #define get_atr \
-    unsigned char atr[ATR_MAX_SIZE]; \
-    uint32_t atr_size; \
-    memset(atr, 0, sizeof(atr)); \
-    ATR_GetRaw(newatr, atr, &atr_size);
+    uint8_t atr[ATR_MAX_SIZE]; \
+    uint32_t atr_size; \
+    memset(atr, 0, sizeof(atr)); \
+    ATR_GetRaw(newatr, atr, &atr_size);
 
 #define get_atr2 \
-    unsigned char atr2[ATR_MAX_SIZE]; \
-    uint32_t atr_size2; \
-    memset(atr2, 0, sizeof(atr2)); \
-    ATR_GetRaw(newatr, atr2, &atr_size2);
+    uint8_t atr2[ATR_MAX_SIZE]; \
+    uint32_t atr_size2; \
+    memset(atr2, 0, sizeof(atr2)); \
+    ATR_GetRaw(newatr, atr2, &atr_size2);
 
 #define get_hist \
-    unsigned char hist[ATR_MAX_HISTORICAL]; \
-    uint32_t hist_size = 0; \
-    ATR_GetHistoricalBytes(newatr, hist, &hist_size);
+    uint8_t hist[ATR_MAX_HISTORICAL]; \
+    uint32_t hist_size = 0; \
+    ATR_GetHistoricalBytes(newatr, hist, &hist_size);
 
 #define def_resp \
-    unsigned char cta_res[CTA_RES_LEN]; \
-    memset(cta_res, 0, CTA_RES_LEN); \
-    uint16_t cta_lr;
+    uint8_t cta_res[CTA_RES_LEN]; \
+    memset(cta_res, 0, CTA_RES_LEN); \
+    uint16_t cta_lr;
 
 #ifdef WITH_CARDREADER
@@ -53 +53 @@
 void cardreader_get_card_info(struct s_reader *reader);
 void cardreader_poll_status(struct s_reader *reader);
-int32_t check_sct_len(const unsigned char *data, int32_t off);
+int32_t check_sct_len(const uint8_t *data, int32_t off);
 #else
 static inline void cardreader_init_locks(void) { }