Skip to content

Commit

Permalink
Merge pull request #622 from timgates42/bugfix_typo_mechanism
Browse files Browse the repository at this point in the history
docs: fix simple typo, mecanism -> mechanism
  • Loading branch information
doegox committed Oct 11, 2020
2 parents d9a04a5 + 126cf9c commit c3f739d
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion contrib/win32/libnfc/buses/uart.c
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ uart_receive(serial_port sp, uint8_t *pbtRx, const size_t szRx, void *abort_p, i
log_put(LOG_GROUP, LOG_CATEGORY, NFC_LOG_PRIORITY_DEBUG, "Timeouts are set to %lu ms", timeout_ms);

// TODO Enhance the reception method
// - According to MSDN, it could be better to implement nfc_abort_command() mecanism using Cancello()
// - According to MSDN, it could be better to implement nfc_abort_command() mechanism using Cancello()
volatile bool *abort_flag_p = (volatile bool *)abort_p;
do {
log_put(LOG_GROUP, LOG_CATEGORY, NFC_LOG_PRIORITY_DEBUG, "ReadFile");
Expand Down
2 changes: 1 addition & 1 deletion libnfc/drivers/acr122_usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,7 @@ acr122_usb_receive(nfc_device *pnd, uint8_t *pbtData, const size_t szDataLen, co
if (timeout == USB_INFINITE_TIMEOUT) {
usb_timeout = USB_TIMEOUT_PER_PASS;
} else {
// A user-provided timeout is set, we have to cut it in multiple chunk to be able to keep an nfc_abort_command() mecanism
// A user-provided timeout is set, we have to cut it in multiple chunk to be able to keep an nfc_abort_command() mechanism
remaining_time -= USB_TIMEOUT_PER_PASS;
if (remaining_time <= 0) {
pnd->last_error = NFC_ETIMEOUT;
Expand Down
2 changes: 1 addition & 1 deletion libnfc/drivers/acr122s.c
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ acr122s_close(nfc_device *pnd)
uart_close(DRIVER_DATA(pnd)->port);

#ifndef WIN32
// Release file descriptors used for abort mecanism
// Release file descriptors used for abort mechanism
close(DRIVER_DATA(pnd)->abort_fds[0]);
close(DRIVER_DATA(pnd)->abort_fds[1]);
#endif
Expand Down
6 changes: 3 additions & 3 deletions libnfc/drivers/arygon.c
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ arygon_scan(const nfc_context *context, nfc_connstring connstrings[], const size
}

#ifndef WIN32
// pipe-based abort mecanism
// pipe-based abort mechanism
if (pipe(DRIVER_DATA(pnd)->iAbortFds) < 0) {
uart_close(DRIVER_DATA(pnd)->port);
pn53x_data_free(pnd);
Expand Down Expand Up @@ -211,7 +211,7 @@ arygon_close_step2(nfc_device *pnd)
uart_close(DRIVER_DATA(pnd)->port);

#ifndef WIN32
// Release file descriptors used for abort mecanism
// Release file descriptors used for abort mechanism
close(DRIVER_DATA(pnd)->iAbortFds[0]);
close(DRIVER_DATA(pnd)->iAbortFds[1]);
#endif
Expand Down Expand Up @@ -304,7 +304,7 @@ arygon_open(const nfc_context *context, const nfc_connstring connstring)
pnd->driver = &arygon_driver;

#ifndef WIN32
// pipe-based abort mecanism
// pipe-based abort mechanism
if (pipe(DRIVER_DATA(pnd)->iAbortFds) < 0) {
uart_close(DRIVER_DATA(pnd)->port);
pn53x_data_free(pnd);
Expand Down
6 changes: 3 additions & 3 deletions libnfc/drivers/pn532_uart.c
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ pn532_uart_scan(const nfc_context *context, nfc_connstring connstrings[], const
CHIP_DATA(pnd)->power_mode = LOWVBAT;

#ifndef WIN32
// pipe-based abort mecanism
// pipe-based abort mechanism
if (pipe(DRIVER_DATA(pnd)->iAbortFds) < 0) {
uart_close(DRIVER_DATA(pnd)->port);
pn53x_data_free(pnd);
Expand Down Expand Up @@ -191,7 +191,7 @@ pn532_uart_close(nfc_device *pnd)
uart_close(DRIVER_DATA(pnd)->port);

#ifndef WIN32
// Release file descriptors used for abort mecanism
// Release file descriptors used for abort mechanism
close(DRIVER_DATA(pnd)->iAbortFds[0]);
close(DRIVER_DATA(pnd)->iAbortFds[1]);
#endif
Expand Down Expand Up @@ -277,7 +277,7 @@ pn532_uart_open(const nfc_context *context, const nfc_connstring connstring)
pnd->driver = &pn532_uart_driver;

#ifndef WIN32
// pipe-based abort mecanism
// pipe-based abort mechanism
if (pipe(DRIVER_DATA(pnd)->iAbortFds) < 0) {
uart_close(DRIVER_DATA(pnd)->port);
pn53x_data_free(pnd);
Expand Down
2 changes: 1 addition & 1 deletion libnfc/drivers/pn53x_usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -623,7 +623,7 @@ pn53x_usb_receive(nfc_device *pnd, uint8_t *pbtData, const size_t szDataLen, con
if (timeout == USB_INFINITE_TIMEOUT) {
usb_timeout = USB_TIMEOUT_PER_PASS;
} else {
// A user-provided timeout is set, we have to cut it in multiple chunk to be able to keep an nfc_abort_command() mecanism
// A user-provided timeout is set, we have to cut it in multiple chunk to be able to keep an nfc_abort_command() mechanism
remaining_time -= USB_TIMEOUT_PER_PASS;
if (remaining_time <= 0) {
pnd->last_error = NFC_ETIMEOUT;
Expand Down

0 comments on commit c3f739d

Please sign in to comment.