From cd98a4ac871bf066d3b85ab3fabde39ca179c9d9 Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Sun, 3 Mar 2013 16:14:58 +0100 Subject: [PATCH] make style --- libnfc/buses/spi_posix.c | 32 +++++++++++++++++--------------- libnfc/drivers/pn532_spi.c | 24 ++++++++++++------------ 2 files changed, 29 insertions(+), 27 deletions(-) diff --git a/libnfc/buses/spi_posix.c b/libnfc/buses/spi_posix.c index 4c73b68..ff725c6 100644 --- a/libnfc/buses/spi_posix.c +++ b/libnfc/buses/spi_posix.c @@ -181,26 +181,28 @@ spi_send_receive(spi_port sp, const uint8_t *pbtTx, const size_t szTx, uint8_t * pbtTx = pbtTxLSB; } - struct spi_ioc_transfer tr_send = { .tx_buf = (unsigned long) pbtTx, - .rx_buf = 0, - .len = szTx , - .delay_usecs = 0, - .speed_hz = 0, - .bits_per_word = 0, - }; + struct spi_ioc_transfer tr_send = { + .tx_buf = (unsigned long) pbtTx, + .rx_buf = 0, + .len = szTx , + .delay_usecs = 0, + .speed_hz = 0, + .bits_per_word = 0, + }; tr[transfers] = tr_send; ++transfers; } if (szRx) { - struct spi_ioc_transfer tr_receive = { .tx_buf = 0, - .rx_buf = (unsigned long) pbtRx, - .len = szRx, - .delay_usecs = 0, - .speed_hz = 0, - .bits_per_word = 0, - }; + struct spi_ioc_transfer tr_receive = { + .tx_buf = 0, + .rx_buf = (unsigned long) pbtRx, + .len = szRx, + .delay_usecs = 0, + .speed_hz = 0, + .bits_per_word = 0, + }; tr[transfers] = tr_receive; ++transfers; } @@ -213,7 +215,7 @@ spi_send_receive(spi_port sp, const uint8_t *pbtTx, const size_t szTx, uint8_t * free(pbtTxLSB); } - if (ret != (int) (szRx + szTx)) { + if (ret != (int)(szRx + szTx)) { return NFC_EIO; } diff --git a/libnfc/drivers/pn532_spi.c b/libnfc/drivers/pn532_spi.c index dcf247b..37a202a 100644 --- a/libnfc/drivers/pn532_spi.c +++ b/libnfc/drivers/pn532_spi.c @@ -287,20 +287,20 @@ pn532_spi_wakeup(nfc_device *pnd) uint8_t spi_byte = 0; res = spi_receive(DRIVER_DATA(pnd)->port, &spi_byte, 1, true); if (res != NFC_SUCCESS) { - return res; + return res; } log_put(LOG_GROUP, LOG_CATEGORY, NFC_LOG_PRIORITY_DEBUG, "Got %x byte from SPI line before wakeup", spi_byte); CHIP_DATA(pnd)->power_mode = NORMAL; // PN532 will be awake soon - if(spi_byte == 0xff) { - log_put(LOG_GROUP, LOG_CATEGORY, NFC_LOG_PRIORITY_DEBUG, "%s", "Wakeup is needed"); - spi_set_speed(DRIVER_DATA(pnd)->port, 5000); // set slow speed + if (spi_byte == 0xff) { + log_put(LOG_GROUP, LOG_CATEGORY, NFC_LOG_PRIORITY_DEBUG, "%s", "Wakeup is needed"); + spi_set_speed(DRIVER_DATA(pnd)->port, 5000); // set slow speed - res = pn532_SAMConfiguration(pnd, PSM_NORMAL, 1000); // wakeup by sending SAMConfiguration, which works just fine + res = pn532_SAMConfiguration(pnd, PSM_NORMAL, 1000); // wakeup by sending SAMConfiguration, which works just fine - spi_set_speed(DRIVER_DATA(pnd)->port, prev_port_speed); + spi_set_speed(DRIVER_DATA(pnd)->port, prev_port_speed); } @@ -320,14 +320,14 @@ pn532_spi_wait_for_data(nfc_device *pnd, int timeout) int timer = 0; int ret; - while ( (ret = pn532_spi_read_spi_status(pnd, timeout)) != pn532_spi_ready) { + while ((ret = pn532_spi_read_spi_status(pnd, timeout)) != pn532_spi_ready) { if (ret < 0) { - return ret; + return ret; } if (DRIVER_DATA(pnd)->abort_flag) { - DRIVER_DATA(pnd)->abort_flag = false; - return NFC_EOPABORTED; + DRIVER_DATA(pnd)->abort_flag = false; + return NFC_EOPABORTED; } if (timeout > 0) { @@ -415,7 +415,7 @@ pn532_spi_receive(nfc_device *pnd, uint8_t *pbtData, const size_t szDataLen, int // long preamble // omit first byte - for (size_t i = 0; i < 3; ++i){ + for (size_t i = 0; i < 3; ++i) { abtRxBuf[i] = abtRxBuf[i + 1]; } @@ -626,7 +626,7 @@ static int pn532_spi_abort_command(nfc_device *pnd) { if (pnd) { - DRIVER_DATA(pnd)->abort_flag = true; + DRIVER_DATA(pnd)->abort_flag = true; } return NFC_SUCCESS;