shinys000114/wiringPi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WiringPi: Remove utsname things from each board's file

Browse Source 
Signed-off-by: Deokgyu Yang <secugyu@gmail.com>
Change-Id: I3b4be4eac57c31867a1a1b380eef26b0866da903
This commit is contained in:
Deokgyu Yang
2020-08-20 18:28:45 +09:00
parent 26f8815087
commit 6f11fefcff
7 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
wiringPi/odroid_template.c
View File

@@ -15,7 +15,6 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <asm/ioctl.h> #include <asm/ioctl.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/utsname.h>
/*----------------------------------------------------------------------------*/ /*----------------------------------------------------------------------------*/
#include "softPwm.h" #include "softPwm.h"

1
wiringPi/odroidc1.c
View File

@@ -15,7 +15,6 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <asm/ioctl.h> #include <asm/ioctl.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/utsname.h>
/*----------------------------------------------------------------------------*/ /*----------------------------------------------------------------------------*/
#include "softPwm.h" #include "softPwm.h"

1
wiringPi/odroidc2.c
View File

@@ -15,7 +15,6 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <asm/ioctl.h> #include <asm/ioctl.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/utsname.h>
/*----------------------------------------------------------------------------*/ /*----------------------------------------------------------------------------*/
#include "softPwm.h" #include "softPwm.h"

1
wiringPi/odroidc4.c
View File

@@ -15,7 +15,6 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <asm/ioctl.h> #include <asm/ioctl.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/utsname.h>
/*----------------------------------------------------------------------------*/ /*----------------------------------------------------------------------------*/
#include "softPwm.h" #include "softPwm.h"

5
wiringPi/odroidn1.c
View File

@@ -15,7 +15,6 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <asm/ioctl.h> #include <asm/ioctl.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/utsname.h>
/*----------------------------------------------------------------------------*/ /*----------------------------------------------------------------------------*/
#include "softPwm.h" #include "softPwm.h"
@@ -761,10 +760,6 @@ static void init_gpio_mmap (void)
static void init_adc_fds (void) static void init_adc_fds (void)
{ {
const char *AIN0_NODE, *AIN1_NODE; 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"; AIN0_NODE = "/sys/devices/platform/ff100000.saradc/iio:device0/in_voltage1_raw";
AIN1_NODE = "/sys/devices/platform/ff100000.saradc/iio:device0/in_voltage0_raw"; AIN1_NODE = "/sys/devices/platform/ff100000.saradc/iio:device0/in_voltage0_raw";

1
wiringPi/odroidn2.c
View File

@@ -15,7 +15,6 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <asm/ioctl.h> #include <asm/ioctl.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/utsname.h>
/*----------------------------------------------------------------------------*/ /*----------------------------------------------------------------------------*/
#include "softPwm.h" #include "softPwm.h"

10
wiringPi/odroidxu3.c
View File

@@ -15,7 +15,6 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <asm/ioctl.h> #include <asm/ioctl.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/utsname.h>
/*----------------------------------------------------------------------------*/ /*----------------------------------------------------------------------------*/
#include "softPwm.h" #include "softPwm.h"
@@ -709,20 +708,19 @@ static void init_gpio_mmap (void)
static void init_adc_fds (void) static void init_adc_fds (void)
{ {
const char *AIN0_NODE, *AIN1_NODE; const char *AIN0_NODE, *AIN1_NODE;
struct utsname uname_buf;
/* ADC node setup */ if ((kernelVersion->major == 4 && kernelVersion->minor == 14) ||
uname(&uname_buf); kernelVersion->major == 5) {
if (strncmp(uname_buf.release, "4.14", 4) == 0) {
AIN0_NODE = "/sys/devices/platform/soc/12d10000.adc/iio:device0/in_voltage0_raw"; 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"; 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"; 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"; AIN1_NODE = "/sys/devices/platform/soc:/12d10000.adc:/iio:device0/in_voltage3_raw";
} else { // 3.10 kernel } else { // 3.10 kernel
AIN0_NODE = "/sys/devices/12d10000.adc/iio:device0/in_voltage0_raw"; AIN0_NODE = "/sys/devices/12d10000.adc/iio:device0/in_voltage0_raw";
AIN1_NODE = "/sys/devices/12d10000.adc/iio:device0/in_voltage3_raw"; AIN1_NODE = "/sys/devices/12d10000.adc/iio:device0/in_voltage3_raw";
} }
adcFds[0] = open(AIN0_NODE, O_RDONLY); adcFds[0] = open(AIN0_NODE, O_RDONLY);
adcFds[1] = open(AIN1_NODE, O_RDONLY); adcFds[1] = open(AIN1_NODE, O_RDONLY);
} }