Merge pull request #119 from JesseMcL/pr

Add GPIO pullup configurations and fix PWM Segfault on kernel 4.1+

Author: pdp7

setup.py

@@ -40,7 +40,7 @@
       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'], define_macros=kernel41),
+      ext_modules      = [Extension('Adafruit_BBIO.GPIO', ['source/py_gpio.c', 'source/event_gpio.c', 'source/c_pinmux.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/c_pinmux.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),

source/c_pinmux.c

@@ -10,19 +10,25 @@ BBIO_err set_pin_mode(const char *key, const char *mode)
 	// char ocp_dir[] defined in common.h
 	char path[60]; // "/sys/devices/platform/ocp/ocp:P#_##_pinmux/state"
 	char pinmux_dir[20]; // "ocp:P#_##_pinmux"
+	char pin[6]; //"P#_##"
 	FILE *f = NULL;
+	
+	if (strlen(key) == 4)	// Key P#_# format, must inject '0' to be P#_0#
+		snprintf(pin, sizeof(pin), "%.3s0%c", key,key[3]);
+	else	//copy string
+		snprintf(pin, sizeof(pin), "%s", key);
 
 #ifndef BBBVERSION41
 	BBIO_err err;
-	err = build_path("/sys/devices", "ocp", ocp_dir, sizeof(ocp_dir));
+	err = build_path("/sys/devices/platform", "ocp", ocp_dir, sizeof(ocp_dir));
 	if (err != BBIO_OK) {
 		return err;
 	}
 #else
 	strncpy(ocp_dir, "/sys/devices/platform/ocp", sizeof(ocp_dir));
 #endif
 
-	snprintf(pinmux_dir, sizeof(pinmux_dir), "ocp:%s_pinmux", key);
+	snprintf(pinmux_dir, sizeof(pinmux_dir), "ocp:%s_pinmux", pin);
 	snprintf(path, sizeof(path), "%s/%s/state", ocp_dir, pinmux_dir);
 
 	f = fopen(path, "w");

source/c_pwm.c

@@ -566,22 +566,7 @@ BBIO_err pwm_disable(const char *key)
     struct pwm_exp *pwm, *temp, *prev_pwm = NULL;
     BBIO_err err;
 
-#ifdef BBBVERSION41
-    char buffer[2];
-    size_t len;
-    pwm = lookup_exported_pwm(key);
-
-    // Disable the PWM
-    lseek(pwm->enable_fd, 0, SEEK_SET);
-    len = snprintf(buffer, sizeof(buffer), "0");
-    if (write(pwm->enable_fd, buffer, len) < 0) {
-        return BBIO_SYSFS;
-    }
-
-    // Unexport the PWM
-    // TODO later
-
-#else
+#ifndef BBBVERSION41
     char fragment[18];
     snprintf(fragment, sizeof(fragment), "bone_pwm_%s", key);
     err = unload_device_tree(fragment);
@@ -595,6 +580,22 @@ BBIO_err pwm_disable(const char *key)
     {
         if (strcmp(pwm->key, key) == 0)
         {
+	        
+#ifdef BBBVERSION41
+	        char buffer[2];
+	        size_t len;
+	        
+	        // Disable the PWM
+	        lseek(pwm->enable_fd, 0, SEEK_SET);
+	        len = snprintf(buffer, sizeof(buffer), "0");
+	        if (write(pwm->enable_fd, buffer, len) < 0) {
+		        return BBIO_SYSFS;
+	        }
+
+	        // Unexport the PWM
+	        // TODO later
+#endif
+	        
             //close the fd
             close(pwm->period_fd);
             close(pwm->duty_fd);

source/py_gpio.c

@@ -32,6 +32,7 @@ SOFTWARE.
 #include "constants.h"
 #include "common.h"
 #include "event_gpio.h"
+#include "c_pinmux.h"
 
 static int gpio_warnings = 1;
 
@@ -111,7 +112,12 @@ static PyObject *py_setup_channel(PyObject *self, PyObject *args, PyObject *kwar
    if (direction == OUTPUT) {
        gpio_set_value(gpio, initial);
    } else {
-       gpio_set_value(gpio, pud);
+	   if (pud == PUD_DOWN)
+		   set_pin_mode(channel, "gpio_pd");
+	   else if (pud == PUD_UP)
+		   set_pin_mode(channel, "gpio_pu");
+	   else
+		   set_pin_mode(channel, "gpio");
    }
 
    gpio_direction[gpio] = direction;