djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unix,windows: Use STDIN_FILENO, STDOUT_FILENO macros where appropriate.

Browse Source 
This replaces 0 and 1 with STDIN_FILENO and STDOUT_FILENO to make the
intention of the code clearer.
This commit is contained in:
David Lechner 2020-03-21 17:19:49 -05:00 committed by Damien George
parent 100012bec6
commit 3b07736b6d
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/minimal/uart_core.c
View File

@ -17,7 +17,7 @@ typedef struct {
int mp_hal_stdin_rx_chr(void) { int mp_hal_stdin_rx_chr(void) {
unsigned char c = 0; unsigned char c = 0;
#if MICROPY_MIN_USE_STDOUT #if MICROPY_MIN_USE_STDOUT
int r = read(0, &c, 1); int r = read(STDIN_FILENO, &c, 1);
(void)r; (void)r;
#elif MICROPY_MIN_USE_STM32_MCU #elif MICROPY_MIN_USE_STM32_MCU
// wait for RXNE // wait for RXNE
@ -31,7 +31,7 @@ int mp_hal_stdin_rx_chr(void) {
// Send string of given length // Send string of given length
void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) { void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
#if MICROPY_MIN_USE_STDOUT #if MICROPY_MIN_USE_STDOUT
int r = write(1, str, len); int r = write(STDOUT_FILENO, str, len);
(void)r; (void)r;
#elif MICROPY_MIN_USE_STM32_MCU #elif MICROPY_MIN_USE_STM32_MCU
while (len--) { while (len--) {

4
ports/unix/unix_mphal.c
View File

@ -167,7 +167,7 @@ main_term:;
MP_THREAD_GIL_EXIT(); MP_THREAD_GIL_EXIT();
unsigned char c; unsigned char c;
int ret = read(0, &c, 1); int ret = read(STDIN_FILENO, &c, 1);
MP_THREAD_GIL_ENTER(); MP_THREAD_GIL_ENTER();
if (ret == 0) { if (ret == 0) {
c = 4; // EOF, ctrl-D c = 4; // EOF, ctrl-D
@ -179,7 +179,7 @@ main_term:;
void mp_hal_stdout_tx_strn(const char *str, size_t len) { void mp_hal_stdout_tx_strn(const char *str, size_t len) {
MP_THREAD_GIL_EXIT(); MP_THREAD_GIL_EXIT();
int ret = write(1, str, len); int ret = write(STDOUT_FILENO, str, len);
MP_THREAD_GIL_ENTER(); MP_THREAD_GIL_ENTER();
mp_uos_dupterm_tx_strn(str, len); mp_uos_dupterm_tx_strn(str, len);
(void)ret; // to suppress compiler warning (void)ret; // to suppress compiler warning

2
ports/windows/windows_mphal.c
View File

@ -222,7 +222,7 @@ int mp_hal_stdin_rx_chr(void) {
void mp_hal_stdout_tx_strn(const char *str, size_t len) { void mp_hal_stdout_tx_strn(const char *str, size_t len) {
MP_THREAD_GIL_EXIT(); MP_THREAD_GIL_EXIT();
write(1, str, len); write(STDOUT_FILENO, str, len);
MP_THREAD_GIL_ENTER(); MP_THREAD_GIL_ENTER();
} }