Merge pull request #108 from MatthewWest/develop

Support for PWM in 4.1+

Author: ladyada

setup.py

@@ -41,7 +41,7 @@
       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),
-                          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.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),
                           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

@@ -38,55 +38,58 @@ SOFTWARE.
 
 int adc_initialized = 0;
 
-int initialize_adc(void)
+BBIO_err initialize_adc(void)
 {
 #ifdef BBBVERSION41
     char test_path[49];
 #else
     char test_path[40];
 #endif
     FILE *fh;
+    BBIO_err err;
+
     if (adc_initialized) {
-        return 1;
+        return BBIO_OK;
     }
 
 #ifdef BBBVERSION41
-    if (load_device_tree("BB-ADC")) {
+    err = load_device_tree("BB-ADC");
+    if (err == BBIO_OK) {
         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;
+            return BBIO_SYSFS;
         }
         fclose(fh);
 
         adc_initialized = 1;
-        return 1;
+        return BBIO_OK;
     }
 #else
-    if (load_device_tree("cape-bone-iio")) {
+    err = load_device_tree("cape-bone-iio");
+    if (err == BBIO_OK) {
         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));
         snprintf(test_path, sizeof(test_path), "%s%d", adc_prefix_dir, 0);
         fh = fopen(test_path, "r");
 
         if (!fh) {
-            return 0;
+            return BBIO_SYSFS;
         }
         fclose(fh);
 
         adc_initialized = 1;
-        return 1;
+        return BBIO_OK;
     }
 #endif
 
-    return 0;
+    return BBIO_GEN;
 }
 
-int read_value(unsigned int ain, float *value)
+BBIO_err read_value(unsigned int ain, float *value)
 {
     FILE * fh;
 #ifdef BBBVERSION41
@@ -109,7 +112,7 @@ int read_value(unsigned int ain, float *value)
 
         // Likely a bad path to the ocp device driver 
         if (!fh) {
-            return -1;
+            return BBIO_SYSFS;
         }
 
         fseek(fh, 0, SEEK_SET);
@@ -121,22 +124,22 @@ int read_value(unsigned int ain, float *value)
         try_count++;
     }
 
-    if (read_successful) return 1;
+    if (read_successful) return BBIO_OK;
 
     // Fall through and fail
-    return -1;
+    return BBIO_GEN;
 }
 
-int adc_setup()
+BBIO_err adc_setup(void)
 {
     return initialize_adc();
 }
 
-void adc_cleanup(void)
+BBIO_err adc_cleanup(void)
 {
 #ifdef BBBVERSION41
-    unload_device_tree("BB-ADC");
+    return unload_device_tree("BB-ADC");
 #else
-    unload_device_tree("cape-bone-iio");
+    return unload_device_tree("cape-bone-iio");
 #endif
 }

source/c_adc.h

@@ -21,8 +21,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
+#ifndef BBIO_C_ADC_H
+#define BBIO_C_ADC_H
+#include "common.h"
+
 extern int adc_initialized;
 
-int adc_setup(void);
-int read_value(unsigned int ain, float *value);
-void adc_cleanup(void);
+BBIO_err adc_setup(void);
+BBIO_err read_value(unsigned int ain, float *value);
+BBIO_err adc_cleanup(void);
+#endif

source/c_pinmux.c

@@ -0,0 +1,37 @@
+#include <stdio.h>
+#include <string.h>
+
+#include "c_pinmux.h"
+#include "common.h"
+
+
+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"
+	FILE *f = NULL;
+
+#ifndef BBBVERSION41
+	BBIO_err err;
+	err = build_path("/sys/devices", "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(path, sizeof(path), "%s/%s/state", ocp_dir, pinmux_dir);
+
+	f = fopen(path, "w");
+	if (NULL == f) {
+		return BBIO_ACCESS;
+	} 
+
+	fprintf(f, "%s", mode);
+	fclose(f);
+
+	return BBIO_OK;
+}

source/c_pinmux.h

@@ -0,0 +1,31 @@
+/*
+Copyright (c) 2016 Adafruit
+Author: Matthew West
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+#ifndef C_PINMUX_H
+#define C_PINMUX_H
+
+#include "common.h"
+
+BBIO_err set_pin_mode(const char *key, const char *mode);
+
+#endif