From 175d1f6af053801b5f76d3af034cf4d9caa4c6cb Mon Sep 17 00:00:00 2001 From: Joshua Yang Date: Tue, 4 Sep 2018 10:57:38 +0900 Subject: [PATCH] ODROID C1/C2: Optimize I2C check code Change-Id: I13d4273b8eeee055bde280cd1a25ba6e82b38f28 --- wiringPi/odroidc1.c | 10 ++++++---- wiringPi/odroidc2.c | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/wiringPi/odroidc1.c b/wiringPi/odroidc1.c index e850a4e..59de594 100755 --- a/wiringPi/odroidc1.c +++ b/wiringPi/odroidc1.c @@ -247,10 +247,12 @@ static int getModeToGpio (int mode, int pin) } /* To check I2C module loaded */ - if (moduleLoaded(AML_MODULE_I2C) && (retPin == 74 || retPin == 75)) - return -1; - else - return retPin; + if (retPin == 74 || retPin == 75) { + if (moduleLoaded(AML_MODULE_I2C)) + return -1; + } + + return retPin; } /*----------------------------------------------------------------------------*/ diff --git a/wiringPi/odroidc2.c b/wiringPi/odroidc2.c index 78c5eae..ef0a06c 100755 --- a/wiringPi/odroidc2.c +++ b/wiringPi/odroidc2.c @@ -302,10 +302,12 @@ static int getModeToGpio (int mode, int pin) } /* To check I2C module loaded */ - if (moduleLoaded(AML_MODULE_I2C) && (retPin == 205 || retPin == 206)) - return -1; - else - return retPin; + if (retPin == 205 || retPin == 206) { + if (moduleLoaded(AML_MODULE_I2C)) + return -1; + } + + return retPin; } /*----------------------------------------------------------------------------*/