enhance progress display with MIFARE Classic 1K.
This commit is contained in:
parent
5027d69b7e
commit
d76ee4c2bd
1 changed files with 8 additions and 5 deletions
|
@ -26,8 +26,8 @@
|
||||||
|
|
||||||
#include <freefare.h>
|
#include <freefare.h>
|
||||||
|
|
||||||
#define START_FORMAT_N "Formatting %d blocks"
|
#define START_FORMAT_N "Formatting %d blocks ["
|
||||||
#define DONE_FORMAT " done.\n"
|
#define DONE_FORMAT "] done.\n"
|
||||||
|
|
||||||
MifareClassicKey default_keys[] = {
|
MifareClassicKey default_keys[] = {
|
||||||
{ 0xff,0xff,0xff,0xff,0xff,0xff },
|
{ 0xff,0xff,0xff,0xff,0xff,0xff },
|
||||||
|
@ -43,16 +43,17 @@ int format_mifare_classic_1k (MifareTag tag);
|
||||||
int format_mifare_classic_4k (MifareTag tag);
|
int format_mifare_classic_4k (MifareTag tag);
|
||||||
int try_format_sector (MifareTag tag, MifareClassicBlockNumber block);
|
int try_format_sector (MifareTag tag, MifareClassicBlockNumber block);
|
||||||
|
|
||||||
int at_block = 0;
|
static int at_block = 0;
|
||||||
|
static int mod_block = 10;
|
||||||
|
|
||||||
void
|
void
|
||||||
display_progress ()
|
display_progress ()
|
||||||
{
|
{
|
||||||
at_block++;
|
at_block++;
|
||||||
if (0 == (at_block % 10)) {
|
if (0 == (at_block % mod_block)) {
|
||||||
printf ("%d", at_block);
|
printf ("%d", at_block);
|
||||||
fflush (stdout);
|
fflush (stdout);
|
||||||
} else if (0 == (at_block % 2)) {
|
} else {
|
||||||
printf (".");
|
printf (".");
|
||||||
fflush (stdout);
|
fflush (stdout);
|
||||||
}
|
}
|
||||||
|
@ -155,10 +156,12 @@ main(int argc, char *argv[])
|
||||||
at_block = 0;
|
at_block = 0;
|
||||||
switch (freefare_get_tag_type (tags[i])) {
|
switch (freefare_get_tag_type (tags[i])) {
|
||||||
case CLASSIC_1K:
|
case CLASSIC_1K:
|
||||||
|
mod_block = 4;
|
||||||
if (!format_mifare_classic_1k (tags[i]))
|
if (!format_mifare_classic_1k (tags[i]))
|
||||||
error = 1;
|
error = 1;
|
||||||
break;
|
break;
|
||||||
case CLASSIC_4K:
|
case CLASSIC_4K:
|
||||||
|
mod_block = 16;
|
||||||
if (!format_mifare_classic_4k (tags[i]))
|
if (!format_mifare_classic_4k (tags[i]))
|
||||||
error = 1;
|
error = 1;
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Add table
Reference in a new issue