From 6f11fefcffeaa0f23a61414c847da0a6d75351b1 Mon Sep 17 00:00:00 2001 From: Deokgyu Yang Date: Thu, 20 Aug 2020 18:28:45 +0900 Subject: [PATCH] WiringPi: Remove utsname things from each board's file Signed-off-by: Deokgyu Yang Change-Id: I3b4be4eac57c31867a1a1b380eef26b0866da903 --- wiringPi/odroid_template.c | 1 - wiringPi/odroidc1.c | 1 - wiringPi/odroidc2.c | 1 - wiringPi/odroidc4.c | 1 - wiringPi/odroidn1.c | 5 ----- wiringPi/odroidn2.c | 1 - wiringPi/odroidxu3.c | 10 ++++------ 7 files changed, 4 insertions(+), 16 deletions(-) diff --git a/wiringPi/odroid_template.c b/wiringPi/odroid_template.c index 4706e0a..5cd8e81 100644 --- a/wiringPi/odroid_template.c +++ b/wiringPi/odroid_template.c @@ -15,7 +15,6 @@ #include #include #include -#include /*----------------------------------------------------------------------------*/ #include "softPwm.h" diff --git a/wiringPi/odroidc1.c b/wiringPi/odroidc1.c index 81e1ac5..4ce1d21 100644 --- a/wiringPi/odroidc1.c +++ b/wiringPi/odroidc1.c @@ -15,7 +15,6 @@ #include #include #include -#include /*----------------------------------------------------------------------------*/ #include "softPwm.h" diff --git a/wiringPi/odroidc2.c b/wiringPi/odroidc2.c index 367e96d..71debd6 100644 --- a/wiringPi/odroidc2.c +++ b/wiringPi/odroidc2.c @@ -15,7 +15,6 @@ #include #include #include -#include /*----------------------------------------------------------------------------*/ #include "softPwm.h" diff --git a/wiringPi/odroidc4.c b/wiringPi/odroidc4.c index 54f0ff2..77041cf 100644 --- a/wiringPi/odroidc4.c +++ b/wiringPi/odroidc4.c @@ -15,7 +15,6 @@ #include #include #include -#include /*----------------------------------------------------------------------------*/ #include "softPwm.h" diff --git a/wiringPi/odroidn1.c b/wiringPi/odroidn1.c index 15f18e9..e49e700 100644 --- a/wiringPi/odroidn1.c +++ b/wiringPi/odroidn1.c @@ -15,7 +15,6 @@ #include #include #include -#include /*----------------------------------------------------------------------------*/ #include "softPwm.h" @@ -761,10 +760,6 @@ static void init_gpio_mmap (void) static void init_adc_fds (void) { const char *AIN0_NODE, *AIN1_NODE; - struct utsname uname_buf; - - /* ADC node setup */ - uname(&uname_buf); AIN0_NODE = "/sys/devices/platform/ff100000.saradc/iio:device0/in_voltage1_raw"; AIN1_NODE = "/sys/devices/platform/ff100000.saradc/iio:device0/in_voltage0_raw"; diff --git a/wiringPi/odroidn2.c b/wiringPi/odroidn2.c index 66ba5d4..01ff69e 100644 --- a/wiringPi/odroidn2.c +++ b/wiringPi/odroidn2.c @@ -15,7 +15,6 @@ #include #include #include -#include /*----------------------------------------------------------------------------*/ #include "softPwm.h" diff --git a/wiringPi/odroidxu3.c b/wiringPi/odroidxu3.c index cd0283d..8010b9a 100644 --- a/wiringPi/odroidxu3.c +++ b/wiringPi/odroidxu3.c @@ -15,7 +15,6 @@ #include #include #include -#include /*----------------------------------------------------------------------------*/ #include "softPwm.h" @@ -709,20 +708,19 @@ static void init_gpio_mmap (void) static void init_adc_fds (void) { const char *AIN0_NODE, *AIN1_NODE; - struct utsname uname_buf; - /* ADC node setup */ - uname(&uname_buf); - if (strncmp(uname_buf.release, "4.14", 4) == 0) { + if ((kernelVersion->major == 4 && kernelVersion->minor == 14) || + kernelVersion->major == 5) { AIN0_NODE = "/sys/devices/platform/soc/12d10000.adc/iio:device0/in_voltage0_raw"; AIN1_NODE = "/sys/devices/platform/soc/12d10000.adc/iio:device0/in_voltage3_raw"; - } else if (strncmp(uname_buf.release, "4.9", 3) == 0) { + } else if (kernelVersion->major == 4 && kernelVersion->minor == 9) { AIN0_NODE = "/sys/devices/platform/soc:/12d10000.adc:/iio:device0/in_voltage0_raw"; AIN1_NODE = "/sys/devices/platform/soc:/12d10000.adc:/iio:device0/in_voltage3_raw"; } else { // 3.10 kernel AIN0_NODE = "/sys/devices/12d10000.adc/iio:device0/in_voltage0_raw"; AIN1_NODE = "/sys/devices/12d10000.adc/iio:device0/in_voltage3_raw"; } + adcFds[0] = open(AIN0_NODE, O_RDONLY); adcFds[1] = open(AIN1_NODE, O_RDONLY); }