From aaedeafbb145c1986fa4fe7393149794940acf6e Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Tue, 16 Apr 2019 16:56:56 +0200 Subject: [PATCH] style spaces --- armsrc/appmain.c | 13 ++++++++++++- armsrc/fpgaloader.c | 39 ++++++++++++++++++++------------------- client/cmdcrc.c | 6 +++--- client/emv/emv_pk.c | 12 ++++++------ client/fpga_compress.c | 4 ++-- client/proxmark3.c | 2 +- 6 files changed, 44 insertions(+), 32 deletions(-) diff --git a/armsrc/appmain.c b/armsrc/appmain.c index 03ce3750b..9376194e9 100644 --- a/armsrc/appmain.c +++ b/armsrc/appmain.c @@ -375,17 +375,28 @@ void printUSBSpeed(void) { uint32_t start_time = end_time = GetTickCount(); uint32_t bytes_transferred = 0; + uint32_t counter = 0, good = 0, res; LED_B_ON(); while (end_time < start_time + USB_SPEED_TEST_MIN_TIME) { - cmd_send(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, 0, USB_CMD_DATA_SIZE, 0, test_data, USB_CMD_DATA_SIZE); + res = cmd_send(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, 0, USB_CMD_DATA_SIZE, 0, test_data, USB_CMD_DATA_SIZE); end_time = GetTickCount(); bytes_transferred += USB_CMD_DATA_SIZE; + if (res == 0) + counter++; + else + good++; } LED_B_OFF(); Dbprintf(" Time elapsed............%dms", end_time - start_time); Dbprintf(" Bytes transferred.......%d", bytes_transferred); Dbprintf(" USB Transfer Speed PM3 -> Client = %d Bytes/s", 1000 * bytes_transferred / (end_time - start_time)); + if (counter > 0) + Dbprintf(" Number of errors %u", counter); + if (good > 0) { + bytes_transferred = USB_CMD_DATA_SIZE * good; + Dbprintf(" Number of good %u / bytes %u, true Speed PM3 -> Client = %d Bytes/s", good, bytes_transferred, 1000 * bytes_transferred / (end_time - start_time)); + } } /** diff --git a/armsrc/fpgaloader.c b/armsrc/fpgaloader.c index 1be2c6138..04c49edd2 100644 --- a/armsrc/fpgaloader.c +++ b/armsrc/fpgaloader.c @@ -449,33 +449,34 @@ void FpgaWriteConfWord(uint8_t v) { // the samples from the ADC always flow through the FPGA. //----------------------------------------------------------------------------- void SetAdcMuxFor(uint32_t whichGpio) { + /* + #ifndef WITH_FPC + // When compiled without FPC support + AT91C_BASE_PIOA->PIO_OER = + GPIO_MUXSEL_HIPKD | + GPIO_MUXSEL_LOPKD | + GPIO_MUXSEL_LORAW | + GPIO_MUXSEL_HIRAW; -#ifndef WITH_FPC - // When compiled without FPC support - AT91C_BASE_PIOA->PIO_OER = - GPIO_MUXSEL_HIPKD | - GPIO_MUXSEL_LOPKD | - GPIO_MUXSEL_LORAW | - GPIO_MUXSEL_HIRAW; + AT91C_BASE_PIOA->PIO_PER = + GPIO_MUXSEL_HIPKD | + GPIO_MUXSEL_LOPKD | + GPIO_MUXSEL_LORAW | + GPIO_MUXSEL_HIRAW; - AT91C_BASE_PIOA->PIO_PER = - GPIO_MUXSEL_HIPKD | - GPIO_MUXSEL_LOPKD | - GPIO_MUXSEL_LORAW | - GPIO_MUXSEL_HIRAW; + LOW(GPIO_MUXSEL_HIPKD); + LOW(GPIO_MUXSEL_LOPKD); + LOW(GPIO_MUXSEL_HIRAW); + LOW(GPIO_MUXSEL_LORAW); - LOW(GPIO_MUXSEL_HIPKD); - LOW(GPIO_MUXSEL_LOPKD); - LOW(GPIO_MUXSEL_HIRAW); - LOW(GPIO_MUXSEL_LORAW); - -#else + #else + */ // FPC serial uses HIRAW/LOWRAW pins, so they are excluded here. AT91C_BASE_PIOA->PIO_OER = GPIO_MUXSEL_HIPKD | GPIO_MUXSEL_LOPKD; AT91C_BASE_PIOA->PIO_PER = GPIO_MUXSEL_HIPKD | GPIO_MUXSEL_LOPKD; LOW(GPIO_MUXSEL_HIPKD); LOW(GPIO_MUXSEL_LOPKD); -#endif +//#endif HIGH(whichGpio); } diff --git a/client/cmdcrc.c b/client/cmdcrc.c index 2a07c7adc..cebd292b8 100644 --- a/client/cmdcrc.c +++ b/client/cmdcrc.c @@ -99,7 +99,7 @@ int GetModels(char *Models[], int *count, uint8_t *width) { rflags &= ~R_HAVEQ; int pass; - + /* if endianness not specified, try * little-endian then big-endian. * NB: crossed-endian algorithms will not be @@ -262,7 +262,7 @@ int RunModel(char *inModel, char *inHexStr, bool reverse, char endian, char *res switch (endian) { case 'b': /* b big-endian (RefIn = false, RefOut = false ) */ model.flags &= ~P_REFIN; - //rflags |= R_HAVERI; + //rflags |= R_HAVERI; /* fall through: */ case 'B': /* B big-endian output (RefOut = false) */ model.flags &= ~P_REFOUT; @@ -274,7 +274,7 @@ int RunModel(char *inModel, char *inHexStr, bool reverse, char endian, char *res break; case 'l': /* l little-endian input and output */ model.flags |= P_REFIN; - //rflags |= R_HAVERI; + //rflags |= R_HAVERI; /* fall through: */ case 'L': /* L little-endian output */ model.flags |= P_REFOUT; diff --git a/client/emv/emv_pk.c b/client/emv/emv_pk.c index a0bb80979..ae23c8470 100644 --- a/client/emv/emv_pk.c +++ b/client/emv/emv_pk.c @@ -42,9 +42,9 @@ static ssize_t emv_pk_read_bin(char *buf, unsigned char *bin, size_t size, size_t *read) { - if ( buf == NULL ) + if (buf == NULL) return 0; - + size_t left = size; char *p = buf; while (*p == ' ') @@ -84,9 +84,9 @@ static ssize_t emv_pk_read_bin(char *buf, unsigned char *bin, size_t size, size_ static ssize_t emv_pk_read_ymv(char *buf, unsigned *ymv) { - if ( buf == NULL ) + if (buf == NULL) return 0; - + int i; unsigned char temp[3]; char *p = buf; @@ -124,9 +124,9 @@ static ssize_t emv_pk_read_ymv(char *buf, unsigned *ymv) { static ssize_t emv_pk_read_string(char *buf, char *str, size_t size) { - if ( buf == NULL ) + if (buf == NULL) return 0; - + char *p = buf; while (*p == ' ') p++; diff --git a/client/fpga_compress.c b/client/fpga_compress.c index aebb3d17d..7e5616813 100644 --- a/client/fpga_compress.c +++ b/client/fpga_compress.c @@ -100,8 +100,8 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile, bool hardn } else { fprintf(stderr, - "Input files too big (total > %li bytes). These are probably not PM3 FPGA config files.\n" - , num_infiles * FPGA_CONFIG_SIZE); + "Input files too big (total > %li bytes). These are probably not PM3 FPGA config files.\n" + , num_infiles * FPGA_CONFIG_SIZE); } for (uint16_t j = 0; j < num_infiles; j++) { fclose(infile[j]); diff --git a/client/proxmark3.c b/client/proxmark3.c index db4479c9a..47a50a6a4 100644 --- a/client/proxmark3.c +++ b/client/proxmark3.c @@ -467,7 +467,7 @@ int main(int argc, char *argv[]) { usb_present = OpenProxmark(port, waitCOMPort, 20, false, speed); if (TestProxmark() == 0) - usb_present = false; + usb_present = false; if (!usb_present) PrintAndLogEx(INFO, "Running in " _YELLOW_("OFFLINE") "mode. Check \"%s -h\" if it's not what you want.\n", exec_name);