Merge pull request #96 from PeteLawler/master

Make BBIO 4.1+ kernel friendly

Author: jwcooper

setup.py

@@ -6,9 +6,18 @@
     pass
 
 import distribute_setup
+import sys
+import platform
 distribute_setup.use_setuptools()
 from setuptools import setup, Extension, find_packages
 
+kernel = platform.release()
+
+if kernel >= '4.1.0':
+    kernel41 = [('BBBVERSION41', None)]
+else:
+    kernel41 = None
+
 classifiers = ['Development Status :: 3 - Alpha',
                'Operating System :: POSIX :: Linux',
                'License :: OSI Approved :: MIT License',
@@ -31,8 +40,9 @@
       classifiers      = classifiers,
       packages         = find_packages(),
       py_modules       = ['Adafruit_I2C'],
-      ext_modules      = [Extension('Adafruit_BBIO.GPIO', ['source/py_gpio.c', 'source/event_gpio.c', 'source/constants.c', 'source/common.c'], extra_compile_args=['-Wno-format-security']),
-                          Extension('Adafruit_BBIO.PWM', ['source/py_pwm.c', 'source/c_pwm.c', 'source/constants.c', 'source/common.c'], extra_compile_args=['-Wno-format-security']),
-                          Extension('Adafruit_BBIO.ADC', ['source/py_adc.c', 'source/c_adc.c', 'source/constants.c', 'source/common.c'], extra_compile_args=['-Wno-format-security']),
-                          Extension('Adafruit_BBIO.SPI', ['source/spimodule.c', 'source/constants.c', 'source/common.c'], extra_compile_args=['-Wno-format-security']),
-                          Extension('Adafruit_BBIO.UART', ['source/py_uart.c', 'source/c_uart.c', 'source/constants.c', 'source/common.c'], extra_compile_args=['-Wno-format-security'])])
+      ext_modules      = [Extension('Adafruit_BBIO.GPIO', ['source/py_gpio.c', 'source/event_gpio.c', 'source/constants.c', 'source/common.c'], extra_compile_args=['-Wno-format-security'], define_macros=kernel41),
+                          Extension('Adafruit_BBIO.PWM', ['source/py_pwm.c', 'source/c_pwm.c', 'source/constants.c', 'source/common.c'], extra_compile_args=['-Wno-format-security'], define_macros=kernel41),
+                          Extension('Adafruit_BBIO.ADC', ['source/py_adc.c', 'source/c_adc.c', 'source/constants.c', 'source/common.c'], extra_compile_args=['-Wno-format-security'], define_macros=kernel41),
+                          Extension('Adafruit_BBIO.SPI', ['source/spimodule.c', 'source/constants.c', 'source/common.c'], extra_compile_args=['-Wno-format-security'], define_macros=kernel41),
+                          Extension('Adafruit_BBIO.UART', ['source/py_uart.c', 'source/c_uart.c', 'source/constants.c', 'source/common.c'], extra_compile_args=['-Wno-format-security'], define_macros=kernel41)] )
+

source/c_adc.c

@@ -30,47 +30,75 @@ SOFTWARE.
 #include "c_adc.h"
 #include "common.h"
 
-char adc_prefix_dir[40];
+#ifdef BBBVERSION41
+    char adc_prefix_dir[49];
+#else
+    char adc_prefix_dir[40];
+#endif
 
 int adc_initialized = 0;
 
 int initialize_adc(void)
 {
+#ifdef BBBVERSION41
+    char test_path[49];
+#else
     char test_path[40];
+#endif
     FILE *fh;
     if (adc_initialized) {
         return 1;
     }
 
+#ifdef BBBVERSION41
+    if (load_device_tree("BB-ADC")) {
+        strncat(adc_prefix_dir, "/sys/bus/iio/devices/iio:device0/in_voltage", sizeof(adc_prefix_dir));
+        snprintf(test_path, sizeof(test_path), "%s%d_raw", adc_prefix_dir, 1);
+        fh = fopen(test_path, "r");
+
+        if (!fh) {
+            puts("wiiii");
+            return 0;
+        }
+        fclose(fh);
+
+        adc_initialized = 1;
+        return 1;
+    }
+#else
     if (load_device_tree("cape-bone-iio")) {
         build_path("/sys/devices", "ocp.", ocp_dir, sizeof(ocp_dir));
         build_path(ocp_dir, "helper.", adc_prefix_dir, sizeof(adc_prefix_dir));
         strncat(adc_prefix_dir, "/AIN", sizeof(adc_prefix_dir));
-
-        // Test that the directory has an AIN entry (found correct devicetree)
         snprintf(test_path, sizeof(test_path), "%s%d", adc_prefix_dir, 0);
-        
         fh = fopen(test_path, "r");
 
         if (!fh) {
-            return 0; 
+            return 0;
         }
         fclose(fh);
 
         adc_initialized = 1;
         return 1;
     }
+#endif
 
     return 0;
 }
 
 int read_value(unsigned int ain, float *value)
 {
     FILE * fh;
+#ifdef BBBVERSION41
+    char ain_path[49];
+    snprintf(ain_path, sizeof(ain_path), "%s%d_raw", adc_prefix_dir, ain);
+#else
     char ain_path[40];
+    snprintf(ain_path, sizeof(ain_path), "%s%d", adc_prefix_dir, ain);
+#endif
+
     int err, try_count=0;
     int read_successful;
-    snprintf(ain_path, sizeof(ain_path), "%s%d", adc_prefix_dir, ain);
 
     read_successful = 0;
 
@@ -106,5 +134,9 @@ int adc_setup()
 
 void adc_cleanup(void)
 {
+#ifdef BBBVERSION41
+    unload_device_tree("BB-ADC");
+#else
     unload_device_tree("cape-bone-iio");
+#endif
 }

source/common.c

@@ -3,6 +3,8 @@ Copyright (c) 2013 Adafruit
 
 Original RPi.GPIO Author Ben Croston
 Modified for BBIO Author Justin Cooper
+Modified for 4.1+ kernels by Grizmio
+Unified for 3.8 and 4.1+ kernels by Peter Lawler <relwalretep@gmail.com>
 
 This file incorporates work covered by the following copyright and 
 permission notice, all modified code adopts the original license:
@@ -33,6 +35,11 @@ SOFTWARE.
 #include <time.h>
 #include "common.h"
 
+#include <linux/version.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)
+    #define BBBVERSION41
+#endif
+
 int setup_error = 0;
 int module_setup = 0;
 
@@ -361,10 +368,16 @@ int get_spi_bus_path_number(unsigned int spi)
 int load_device_tree(const char *name)
 {
     FILE *file = NULL;
-    char slots[40];
+#ifdef BBBVERSION41
+    char slots[41];
+    snprintf(ctrl_dir, sizeof(ctrl_dir), "/sys/devices/platform/bone_capemgr");
+#else
+     char slots[40];
+     build_path("/sys/devices", "bone_capemgr", ctrl_dir, sizeof(ctrl_dir));
+#endif
+
     char line[256];
 
-    build_path("/sys/devices", "bone_capemgr", ctrl_dir, sizeof(ctrl_dir));
     snprintf(slots, sizeof(slots), "%s/slots", ctrl_dir);
 
     file = fopen(slots, "r+");
@@ -394,12 +407,16 @@ int load_device_tree(const char *name)
 int unload_device_tree(const char *name)
 {
     FILE *file = NULL;
+#ifdef BBBVERSION41
+    char slots[41];
+    snprintf(ctrl_dir, sizeof(ctrl_dir), "/sys/devices/platform/bone_capemgr");
+    snprintf(slots, sizeof(slots), "%s/slots", ctrl_dir);
+#else
     char slots[40];
-    char line[256];
-    char *slot_line;
-
     build_path("/sys/devices", "bone_capemgr", ctrl_dir, sizeof(ctrl_dir));
-    snprintf(slots, sizeof(slots), "%s/slots", ctrl_dir);
+#endif
+     char line[256];
+     char *slot_line;
 
     file = fopen(slots, "r+");
     if (!file) {

source/common.h

@@ -39,9 +39,14 @@ SOFTWARE.
 int gpio_mode;
 int gpio_direction[120];
 
-char ctrl_dir[35];
-char ocp_dir[25];
-
+#ifdef BBBVERSION41
+    char ctrl_dir[43];
+    char ocp_dir[33];
+#else
+    char ctrl_dir[35];
+    char ocp_dir[25];
+#endif
+ 
 int get_gpio_number(const char *key, unsigned int *gpio);
 int get_pwm_key(const char *input, char *key);
 int get_adc_ain(const char *key, unsigned int *ain);