Merge pull request #183 from adafruit/fix-issue-178

Fix GPIO regression from BeagleBone Blue support

Author: pdp7

source/c_pinmux.c

@@ -36,9 +36,9 @@ BBIO_err set_pin_mode(const char *key, const char *mode)
 	if (NULL == f) {
 		return BBIO_ACCESS;
 	}
-	syslog(LOG_DEBUG, "set_pin_mode() :: Pinmux file %s access OK", path); 
+	syslog(LOG_DEBUG, "Adafruit_BBIO: set_pin_mode() :: Pinmux file %s access OK", path); 
 	fprintf(f, "%s", mode);
 	fclose(f);
-	syslog(LOG_DEBUG, "set_pin_mode() :: Set pinmux mode to %s for %s", mode, pin);
+	syslog(LOG_DEBUG, "Adafruit_BBIO: set_pin_mode() :: Set pinmux mode to %s for %s", mode, pin);
 	return BBIO_OK;
 }

source/c_pwm.c

@@ -538,7 +538,6 @@ int get_spi_bus_path_number(unsigned int spi)
 
 /*
    Refer to: http://elinux.org/Beagleboard:BeagleBoneBlack_Debian#U-Boot_Overlays
-
    Robert C. Nelson maintains the BeagleBoard.org Debian images and
    suggested adding this check to see if u-boot overlays are enabled.
 
@@ -554,6 +553,7 @@ int uboot_overlay_enabled(void) {
     file = popen(cmd, "r");
     if (file == NULL) {
        fprintf(stderr, "error: uboot_overlay_enabled() failed to run cmd=%s\n", cmd);
+       syslog(LOG_ERR, "Adafruit_BBIO: error: uboot_overlay_enabled() failed to run cmd=%s\n", cmd);
        return -1;
     }
     uboot_overlay = fgetc(file);
@@ -577,6 +577,7 @@ int pocketbeagle(void) {
     file = popen(cmd, "r");
     if (file == NULL) {
        fprintf(stderr, "error: pocketbeagle() failed to run cmd=%s\n", cmd);
+       syslog(LOG_ERR, "Adafruit_BBIO: error: pocketbeagle() failed to run cmd=%s\n", cmd);
        return -1;
     }
     pocketbeagle = fgetc(file);
@@ -589,6 +590,35 @@ int pocketbeagle(void) {
     }
 }
 
+
+/*
+   Check if board is a BeagleBone Blue
+
+   Refer to GitHub issue for more information:
+   https://github.com/adafruit/adafruit-beaglebone-io-python/issues/178
+*/
+int beaglebone_blue(void) {
+    const char *cmd = "/bin/grep -c 'TI AM335x BeagleBone Blue' /proc/device-tree/model";
+    char blue;
+    FILE *file = NULL;
+
+    file = popen(cmd, "r");
+    if (file == NULL) {
+       fprintf(stderr, "error: beaglebone_blue() failed to run cmd=%s\n", cmd);
+       syslog(LOG_ERR, "Adafruit_BBIO: error: beaglebone_blue() failed to run cmd=%s\n", cmd);
+       return -1;
+    }
+    blue = fgetc(file);
+    pclose(file);
+
+    if(blue == '1') {
+      return 1;
+    } else {
+      return 0;
+    }
+}
+
+
 BBIO_err load_device_tree(const char *name)
 {
     char line[256];
@@ -745,7 +775,7 @@ void initlog(int level, const char* ident, int option)
     option = BBIO_LOG_OPTION;
   }
   openlog(ident, option, LOG_LOCAL1);
-  syslog(LOG_NOTICE, "libadafruit-bbio version %s initialized", "<unknown>");
+  syslog(LOG_NOTICE, "Adafruit_BBIO: version %s initialized", "<unknown>");
 
   initialized = 1;
 }

source/common.c

@@ -80,6 +80,9 @@ BBIO_err load_device_tree(const char *name);
 BBIO_err unload_device_tree(const char *name);
 int device_tree_loaded(const char *name);
 BBIO_err get_pwm_by_key(const char *key, pwm_t **pwm);
+int uboot_overlay_enabled(void);
+int beaglebone_blue(void);
+int pocketbeagle(void);
 
 #define BBIO_LOG_OPTION LOG_CONS | LOG_PID | LOG_NDELAY
 void initlog(int level, const char* ident, int option);