forked/libnfc
1
0
Fork 0
mirror of https://github.com/nfc-tools/libnfc.git synced 2026-03-12 10:33:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

astyle --formatted --mode=c --indent=spaces=2 --indent-switches --indent-preprocessor --keep-one-line-blocks --max-instatement-indent=60 --brackets=linux --pad-oper --unpad-paren --pad-header --align-pointer=name

Browse Source
This commit is contained in:
Philippe Teuwen
2012-05-29 15:55:35 +00:00
parent 01303fab0d
commit 568317929d
21 changed files with 94 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libnfc/buses/uart_posix.c
View File

@@ -127,7 +127,7 @@ uart_flush_input(serial_port sp)
if (available_bytes_count == 0) {
return;
}
char* rx = malloc(available_bytes_count);
char *rx = malloc(available_bytes_count);
// There is something available, read the data
res = read(UART_DATA(sp)->fd, rx, available_bytes_count);
log_put(LOG_CATEGORY, NFC_PRIORITY_TRACE, "%d bytes have eatten.", available_bytes_count);
@@ -250,7 +250,7 @@ uart_close(const serial_port sp)
int
uart_receive(serial_port sp, uint8_t *pbtRx, const size_t szRx, void *abort_p, int timeout)
{
int iAbortFd = abort_p ? *((int*)abort_p) : 0;
int iAbortFd = abort_p ? *((int *)abort_p) : 0;
int received_bytes_count = 0;
int available_bytes_count = 0;
const int expected_bytes_count = (int)szRx;

10
libnfc/buses/uart_win32.c
View File

@@ -139,7 +139,7 @@ uart_get_speed(const serial_port sp)
}
int
uart_receive(serial_port sp, uint8_t * pbtRx, const size_t szRx, void * abort_p, int timeout)
uart_receive(serial_port sp, uint8_t *pbtRx, const size_t szRx, void *abort_p, int timeout)
{
DWORD dwBytesToGet = (DWORD)szRx;
DWORD dwBytesReceived = 0;
@@ -163,7 +163,7 @@ uart_receive(serial_port sp, uint8_t * pbtRx, const size_t szRx, void * abort_p,
// TODO Enhance the reception method
// - According to MSDN, it could be better to implement nfc_abort_command() mecanism using Cancello()
volatile bool * abort_flag_p = (volatile bool *)abort_p;
volatile bool *abort_flag_p = (volatile bool *)abort_p;
do {
log_put(LOG_CATEGORY, NFC_PRIORITY_TRACE, "ReadFile");
res = ReadFile(((struct serial_port_windows *) sp)->hPort, pbtRx + dwTotalBytesReceived,
@@ -194,7 +194,7 @@ uart_receive(serial_port sp, uint8_t * pbtRx, const size_t szRx, void * abort_p,
}
int
uart_send(serial_port sp, const uint8_t * pbtTx, const size_t szTx, int timeout)
uart_send(serial_port sp, const uint8_t *pbtTx, const size_t szTx, int timeout)
{
DWORD dwTxLen = 0;
@@ -238,12 +238,12 @@ BOOL is_port_available(int nPort)
char **
uart_list_ports(void)
{
char **availablePorts = malloc((1 + MAX_SERIAL_PORT_WIN) * sizeof(char*));
char **availablePorts = malloc((1 + MAX_SERIAL_PORT_WIN) * sizeof(char *));
int curIndex = 0;
int i;
for (i = 1; i <= MAX_SERIAL_PORT_WIN; i++) {
if (is_port_available(i)) {
availablePorts[curIndex] = (char*)malloc(10);
availablePorts[curIndex] = (char *)malloc(10);
sprintf(availablePorts[curIndex], "COM%d", i);
// printf("found candidate port: %s\n", availablePorts[curIndex]);
curIndex++;