summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2010-08-14 16:26:20 +0800
committerHarald Welte <laforge@gnumonks.org>2010-08-14 16:26:20 +0800
commit67f1385a353b0a89ceb3cb11a31161e0bee6680e (patch)
tree3c0bb256d33483264719e8ce352cda3a8a6203a0
parentaacd31e32689c4dc1bf7b4cdc5e98d074c47619c (diff)
Fix the block/sector naming mistake in structure names
-rw-r--r--easytool/easycard.h8
-rw-r--r--easytool/easytool.c8
2 files changed, 8 insertions, 8 deletions
diff --git a/easytool/easycard.h b/easytool/easycard.h
index 7da1015..e6ce806 100644
--- a/easytool/easycard.h
+++ b/easytool/easycard.h
@@ -11,15 +11,15 @@
extern const struct value_string easy_tt_names[];
extern const struct value_string taipei_mrt_stn_id[];
-/* Sector 0 of Block 2 seems to contain manufacturing timestamp */
-struct easy_block2sec0 {
+/* Block 0 of Sector 2 seems to contain manufacturing timestamp */
+struct easy_sect2blk0 {
uint8_t unknown[6];
uint8_t timestamp[3];
uint8_t unknown2[7];
} __attribute__ ((packed));
-/* Sector 2 of Block 15 */
-struct easy_block15sec2 {
+/* Block 2 of Sector 15 */
+struct easy_sect15blk2 {
uint8_t unknown[11];
uint8_t day_of_month;
uint8_t unknown2; /* always 0x3d? */
diff --git a/easytool/easytool.c b/easytool/easytool.c
index fa15c6b..35735fa 100644
--- a/easytool/easytool.c
+++ b/easytool/easytool.c
@@ -111,10 +111,10 @@ static void dump_easycard(mifare_tag *mft)
mifare_block_manufacturer *manuf = &mft->amb[0].mbm;
struct mfcl_value_block *val =
(struct mfcl_value_block *) mft->amb[8].mbd.abtData;
- struct easy_block2sec0 *b2s0 =
- (struct easy_block2sec0 *) mft->amb[1*4+0].mbd.abtData;
- struct easy_block15sec2 *b15s2 =
- (struct easy_block15sec2 *) mft->amb[15*4+2].mbd.abtData;
+ struct easy_sect2blk0 *b2s0 =
+ (struct easy_sect2blk0 *) mft->amb[1*4+0].mbd.abtData;
+ struct easy_sect15blk2 *b15s2 =
+ (struct easy_sect15blk2 *) mft->amb[15*4+2].mbd.abtData;
uint32_t uid = *((uint32_t *) manuf->abtUID);
/* dump the header */
personal git repositories of Harald Welte. Your mileage may vary