From 10956702a5eca4b38a30589b9f48e45bff7ef814 Mon Sep 17 00:00:00 2001 From: Nazar Date: Mon, 8 Apr 2019 12:31:56 +0300 Subject: [PATCH] Avoid dead code blocks --- wiringPi/wiringPi.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/wiringPi/wiringPi.c b/wiringPi/wiringPi.c index 3918f2f..1e5b1db 100644 --- a/wiringPi/wiringPi.c +++ b/wiringPi/wiringPi.c @@ -1854,24 +1854,23 @@ int digitalRead(int pin) { return 0; } + if (pin == 0 && wiringPiMode == WPI_MODE_GPIO_SYS) { + //printf("%d %s,%d invalid pin,please check it over.\n",pin,__func__, __LINE__); + return 0; + } if (pin > 0 && pin < MAX_PIN_COUNT) { if (wiringPiMode == WPI_MODE_GPIO_SYS) { // Sys mode if (wiringPiDebug) { printf("in digitalRead, wiringPiMode == WPI_MODE_GPIO_SYS\n"); } - if (pin == 0) { - //printf("%d %s,%d invalid pin,please check it over.\n",pin,__func__, __LINE__); - return 0; - } - - //TODO: fix me - /* - if (syspin[pin] == -1) { - //printf("%d %s,%d invalid pin,please check it over.\n",pin,__func__, __LINE__); - return 0; - } - */ - if (sysFds [pin] == -1) { + //TODO: fix me + /* + if (syspin[pin] == -1) { + //printf("%d %s,%d invalid pin,please check it over.\n",pin,__func__, __LINE__); + return 0; + } + */ + if (sysFds [pin] == -1) { if (wiringPiDebug) printf("pin %d sysFds -1.%s,%d\n", pin, __func__, __LINE__); return LOW; @@ -1921,11 +1920,12 @@ int digitalReadSilence(int pin) { return 0; } + if (pin == 0 && wiringPiMode == WPI_MODE_GPIO_SYS) { + return 0; + } + if (pin > 0 && pin < MAX_PIN_COUNT) { if (wiringPiMode == WPI_MODE_GPIO_SYS) { // Sys mode - if (pin == 0) { - return 0; - } if (sysFds [pin] == -1) { return LOW; }