rpi_gpio 0.1.5 → 0.2.0

data/ext/rpi_gpio/c_gpio.h

@@ -1,50 +1,53 @@
-/*
-Original code by Ben Croston modified for Ruby by Nick Lowery
-(github.com/clockvapor)
-Copyright (c) 2014-2015 Nick Lowery
-
-Copyright (c) 2013-2014 Ben Croston
-
-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.
-*/
-
-int setup(void);
-void setup_gpio(int gpio, int direction, int pud);
-int gpio_function(int gpio);
-void output_gpio(int gpio, int value);
-int input_gpio(int gpio);
-void set_rising_event(int gpio, int enable);
-void set_falling_event(int gpio, int enable);
-void set_high_event(int gpio, int enable);
-void set_low_event(int gpio, int enable);
-int eventdetected(int gpio);
-void cleanup(void);
-
-#define SETUP_OK          0
-#define SETUP_DEVMEM_FAIL 1
-#define SETUP_MALLOC_FAIL 2
-#define SETUP_MMAP_FAIL   3
-
-#define INPUT  1 // is really 0 for control register!
-#define OUTPUT 0 // is really 1 for control register!
-#define ALT0   4
-
-#define PUD_OFF  0
-#define PUD_DOWN 1
-#define PUD_UP   2
+/*
+Original code by Ben Croston modified for Ruby by Nick Lowery
+(github.com/clockvapor)
+Copyright (c) 2014-2015 Nick Lowery
+
+Copyright (c) 2013-2014 Ben Croston
+
+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.
+*/
+
+int setup(void);
+void setup_gpio(int gpio, int direction, int pud);
+int gpio_function(int gpio);
+void output_gpio(int gpio, int value);
+int input_gpio(int gpio);
+void set_rising_event(int gpio, int enable);
+void set_falling_event(int gpio, int enable);
+void set_high_event(int gpio, int enable);
+void set_low_event(int gpio, int enable);
+int eventdetected(int gpio);
+void cleanup(void);
+
+#define SETUP_OK          0
+#define SETUP_DEVMEM_FAIL 1
+#define SETUP_MALLOC_FAIL 2
+#define SETUP_MMAP_FAIL   3
+
+#define INPUT  1 // is really 0 for control register!
+#define OUTPUT 0 // is really 1 for control register!
+#define ALT0   4
+
+#define HIGH 1
+#define LOW  0
+
+#define PUD_OFF  0
+#define PUD_DOWN 1
+#define PUD_UP   2

data/ext/rpi_gpio/common.c

@@ -1,100 +1,101 @@
-/*
-Original code by Ben Croston modified for Ruby by Nick Lowery
-(github.com/clockvapor)
-Copyright (c) 2014-2015 Nick Lowery
-
-Copyright (c) 2013-2014 Ben Croston
-
-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.
-*/
-
-#include "ruby.h"
-#include "c_gpio.h"
-#include "common.h"
-
-int gpio_mode = MODE_UNKNOWN;
-const int pin_to_gpio_rev1[41] = {-1, -1, -1, 0, -1, 1, -1, 4, 14, -1, 15, 17, 
-  18, 21, -1, 22, 23, -1, 24, 10, -1, 9, 25, 11, 8, -1, 7, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1 };
-const int pin_to_gpio_rev2[41] = {-1, -1, -1, 2, -1, 3, -1, 4, 14, -1, 15, 17, 
-  18, 27, -1, 22, 23, -1, 24, 10, -1, 9, 25, 11, 8, -1, 7, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1 };
-const int pin_to_gpio_rev3[41] = {-1, -1, -1, 2, -1, 3, -1, 4, 14, -1, 15, 17, 
-  18, 27, -1, 22, 23, -1, 24, 10, -1, 9, 25, 11, 8, -1, 7, -1, -1, 5, -1, 6, 12,
-  13, -1, 19, 16, 26, 20, -1, 21 };
-int setup_error = 0;
-int module_setup = 0;
-int revision = -1;
-
-int check_gpio_priv(void)
-{
-    // check module has been imported cleanly
-    if (setup_error)
-    {
-        rb_raise(rb_eRuntimeError, "Gem not imported correctly!");
-        return 1;
-    }
-
-    // check mmap setup has worked
-    if (!module_setup)
-    {
-        rb_raise(rb_eRuntimeError, "No access to /dev/mem.  Try "
-          "running as root!");
-        return 2;
-    }
-    return 0;
-}
-
-int get_gpio_number(int channel, unsigned int *gpio)
-{
-    // check setmode() has been run
-    if (gpio_mode != BOARD && gpio_mode != BCM)
-    {
-        rb_raise(rb_eRuntimeError, "Please set pin numbering mode "
-          "using RPi::GPIO.set_mode(RPi::GPIO::BOARD) or "
-          "RPi::GPIO.set_mode(RPi::GPIO::BCM)");
-        return 3;
-    }
-    
-    // check channel number is in range
-    if ( (gpio_mode == BCM && (channel < 0 || channel > 53))
-      || (gpio_mode == BOARD && (channel < 1 || channel > 26) && revision != 3)
-      || (gpio_mode == BOARD && (channel < 1 || channel > 40) && revision == 3))
-    {
-        rb_raise(rb_eArgError, "The channel sent is invalid on a Raspberry Pi");
-        return 4;
-    }
-
-    // convert channel to gpio
-    if (gpio_mode == BOARD)
-    {
-        if (*(*pin_to_gpio+channel) == -1)
-        {
-            rb_raise(rb_eArgError, "The channel sent is invalid on a Raspberry "
-              "Pi");
-            return 5;
-        } else {
-            *gpio = *(*pin_to_gpio+channel);
-        }
-    }
-    else // gpio_mode == BCM
-      *gpio = channel;
-
-    return 0;
-}
+/*
+Original code by Ben Croston modified for Ruby by Nick Lowery
+(github.com/clockvapor)
+Copyright (c) 2014-2015 Nick Lowery
+
+Copyright (c) 2013-2014 Ben Croston
+
+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.
+*/
+
+#include "ruby.h"
+#include "c_gpio.h"
+#include "common.h"
+
+int gpio_mode = MODE_UNKNOWN;
+const int pin_to_gpio_rev1[41] = {-1, -1, -1, 0, -1, 1, -1, 4, 14, -1, 15, 17, 
+  18, 21, -1, 22, 23, -1, 24, 10, -1, 9, 25, 11, 8, -1, 7, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1 };
+const int pin_to_gpio_rev2[41] = {-1, -1, -1, 2, -1, 3, -1, 4, 14, -1, 15, 17, 
+  18, 27, -1, 22, 23, -1, 24, 10, -1, 9, 25, 11, 8, -1, 7, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1 };
+const int pin_to_gpio_rev3[41] = {-1, -1, -1, 2, -1, 3, -1, 4, 14, -1, 15, 17, 
+  18, 27, -1, 22, 23, -1, 24, 10, -1, 9, 25, 11, 8, -1, 7, -1, -1, 5, -1, 6, 12,
+  13, -1, 19, 16, 26, 20, -1, 21 };
+int setup_error = 0;
+int module_setup = 0;
+
+int check_gpio_priv(void)
+{
+    // check module has been imported cleanly
+    if (setup_error)
+    {
+        rb_raise(rb_eRuntimeError, "gem not imported correctly!");
+        return 1;
+    }
+
+    // check mmap setup has worked
+    if (!module_setup)
+    {
+        rb_raise(rb_eRuntimeError, "no access to /dev/mem.  Try "
+          "running as root!");
+        return 2;
+    }
+    return 0;
+}
+
+int get_gpio_number(int channel, unsigned int *gpio)
+{
+    // check setmode() has been run
+    if (gpio_mode != BOARD && gpio_mode != BCM)
+    {
+        rb_raise(rb_eRuntimeError, "please set pin numbering mode "
+          "using RPi::GPIO.set_numbering :board or "
+          "RPi::GPIO.set_numbering :bcm");
+        return 3;
+    }
+
+    // check channel number is in range
+    if ( (gpio_mode == BCM && (channel < 0 || channel > 53))
+      || (gpio_mode == BOARD && (channel < 1 || channel > 26) && 
+          rpiinfo.p1_revision != 3)
+      || (gpio_mode == BOARD && (channel < 1 || channel > 40) &&
+          rpiinfo.p1_revision == 3))
+    {
+        rb_raise(rb_eArgError, "the channel sent is invalid on a Raspberry Pi");
+        return 4;
+    }
+
+    // convert channel to gpio
+    if (gpio_mode == BOARD)
+    {
+        if (*(*pin_to_gpio+channel) == -1)
+        {
+            rb_raise(rb_eArgError, "the channel sent is invalid on a Raspberry "
+              "Pi");
+            return 5;
+        } else {
+            *gpio = *(*pin_to_gpio+channel);
+        }
+    }
+    else // gpio_mode == BCM
+      *gpio = channel;
+
+    return 0;
+}

data/ext/rpi_gpio/common.h

@@ -1,46 +1,47 @@
-/*
-Original code by Ben Croston modified for Ruby by Nick Lowery
-(github.com/clockvapor)
-Copyright (c) 2014-2015 Nick Lowery
-
-Copyright (c) 2013-2014 Ben Croston
-
-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.
-*/
-
-#define MODE_UNKNOWN -1
-#define BOARD        10
-#define BCM          11
-#define SERIAL       40
-#define SPI          41
-#define I2C          42
-#define PWM          43
-
-int gpio_mode;
-const int pin_to_gpio_rev1[41];
-const int pin_to_gpio_rev2[41];
-const int pin_to_gpio_rev3[41];
-const int (*pin_to_gpio)[41];
-int gpio_direction[54];
-int revision;
-
-int check_gpio_priv(void);
-int get_gpio_number(int channel, unsigned int *gpio);
-int setup_error;
-int module_setup;
+/*
+Original code by Ben Croston modified for Ruby by Nick Lowery
+(github.com/clockvapor)
+Copyright (c) 2014-2015 Nick Lowery
+
+Copyright (c) 2013-2014 Ben Croston
+
+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.
+*/
+
+#include "cpuinfo.h"
+
+#define MODE_UNKNOWN -1
+#define BOARD        10
+#define BCM          11
+#define SERIAL       40
+#define SPI          41
+#define I2C          42
+#define PWM          43
+
+int gpio_mode;
+const int pin_to_gpio_rev1[41];
+const int pin_to_gpio_rev2[41];
+const int pin_to_gpio_rev3[41];
+const int (*pin_to_gpio)[41];
+int gpio_direction[54];
+rpi_info rpiinfo;
+int setup_error;
+int module_setup;
+int check_gpio_priv(void);
+int get_gpio_number(int channel, unsigned int *gpio);

data/ext/rpi_gpio/cpuinfo.c

@@ -1,88 +1,159 @@
-/*
-Original code by Ben Croston modified for Ruby by Nick Lowery
-(github.com/clockvapor)
-Copyright (c) 2014-2015 Nick Lowery
-
-Copyright (c) 2013-2014 Ben Croston
-
-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.
-*/
-
-#include <stdio.h>
-#include <string.h>
-#include "cpuinfo.h"
-
-char *get_cpuinfo_revision(char *revision)
-{
-   FILE *fp;
-   char buffer[1024];
-   char hardware[1024];
-   int  rpi_found = 0;
-
-   if ((fp = fopen("/proc/cpuinfo", "r")) == NULL)
-      return 0;
-
-   while(!feof(fp)) {
-      fgets(buffer, sizeof(buffer) , fp);
-      sscanf(buffer, "Hardware	: %s", hardware);
-      if (strcmp(hardware, "BCM2708") == 0)
-         rpi_found = 1;
-      sscanf(buffer, "Revision	: %s", revision);
-   }
-   fclose(fp);
-
-   if (!rpi_found)
-      revision = NULL;
-   return revision;
-}
-
-int get_rpi_revision(void)
-{
-   char raw_revision[1024] = {'\0'};
-   int len;
-   char *revision;
-
-   if (get_cpuinfo_revision(raw_revision) == NULL)
-      return -1;
-
-   // get last four characters (ignore preceeding 1000 for overvolt)
-   len = strlen(raw_revision);
-   if (len > 4)
-      revision = (char *)&raw_revision+len-4;
-   else
-      revision = raw_revision;
-
-   if ((strcmp(revision, "0002") == 0) ||
-       (strcmp(revision, "0003") == 0))
-      return 1;
-   else if ((strcmp(revision, "0004") == 0) ||
-            (strcmp(revision, "0005") == 0) ||
-            (strcmp(revision, "0006") == 0) ||
-            (strcmp(revision, "0007") == 0) ||
-            (strcmp(revision, "0008") == 0) ||
-            (strcmp(revision, "0009") == 0) ||
-            (strcmp(revision, "000d") == 0) ||
-            (strcmp(revision, "000e") == 0) ||
-            (strcmp(revision, "000f") == 0))
-      return 2;  // revision 2
-   else if (strcmp(revision, "0011") == 0)
-      return 0;  // compute module
-   else   // assume B+ (0010) or A+ (0012)
-      return 3;
-}
+/*
+Original code by Ben Croston modified for Ruby by Nick Lowery
+(github.com/clockvapor)
+Copyright (c) 2014-2015 Nick Lowery
+
+Copyright (c) 2013-2014 Ben Croston
+
+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.
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "cpuinfo.h"
+
+int get_rpi_info(rpi_info *info)
+{
+    FILE *fp;
+    char buffer[1024];
+    char hardware[1024];
+    char revision[1024];
+    char *rev;
+    int found = 0;
+    int len;
+
+    if ((fp = fopen("/proc/cpuinfo", "r")) == NULL) {
+        return -1;
+    }
+    while(!feof(fp)) {
+        fgets(buffer, sizeof(buffer) , fp);
+        sscanf(buffer, "Hardware	: %s", hardware);
+        if (strcmp(hardware, "BCM2708") == 0 ||
+            strcmp(hardware, "BCM2709") == 0 ||
+            strcmp(hardware, "BCM2835") == 0 ||
+            strcmp(hardware, "BCM2836") == 0) {
+            found = 1;
+        }
+        sscanf(buffer, "Revision	: %s", revision);
+    }
+    fclose(fp);
+
+    if (!found) {
+        return -1;
+    }
+
+    if ((len = strlen(revision)) == 0) {
+        return -1;
+    }
+
+    if (len >= 6 && strtol((char[]){revision[len-6],0}, NULL, 16) & 8) {
+	      // new scheme
+        //info->rev = revision[len-1]-'0';
+        strcpy(info->revision, revision);
+        switch (revision[len-2]) {
+            case '0': info->type = "Model A"; info->p1_revision = 2; break;
+		        case '1': info->type = "Model B"; info->p1_revision = 2; break;
+		        case '2': info->type = "Model A+"; info->p1_revision = 3; break;
+		        case '3': info->type = "Model B+"; info->p1_revision = 3; break;
+		        case '4': info->type = "Pi2 Model B"; info->p1_revision = 3; break;
+		        case '5': info->type = "Alpha"; info->p1_revision = 3; break;
+		        case '6': info->type = "Compute"; info->p1_revision = 0; break;
+		        default : info->type = "Unknown"; info->p1_revision = 3; break;
+        }
+	      switch (revision[len-4]) {
+		        case '0': info->processor = "BCM2835"; break;
+		        case '1': info->processor = "BCM2836"; break;
+		        default : info->processor = "Unknown"; break;
+	      }
+	      switch (revision[len-5]) {
+		        case '0': info->manufacturer = "Sony"; break;
+		        case '1': info->manufacturer = "Egoman"; break;
+		        case '2': info->manufacturer = "Embest"; break;
+		        case '4': info->manufacturer = "Embest"; break;
+		        default : info->manufacturer = "Unknown"; break;
+	      }
+	      switch (strtol((char[]){revision[len-6],0}, NULL, 16) & 7) {
+		        case 0: info->ram = "256M"; break;
+		        case 1: info->ram = "512M"; break;
+		        case 2: info->ram = "1024M"; break;
+		        default: info->ram = "Unknown"; break;
+        }
+    } else {
+        // old scheme
+        info->ram = "Unknown";
+        info->manufacturer = "Unknown";
+        info->processor = "Unknown";
+        info->type = "Unknown";
+        strcpy(info->revision, revision);
+       
+        // get last four characters (ignore preceeding 1000 for overvolt)
+        if (len > 4) {
+            rev = (char *)&revision+len-4;
+        } else {
+            rev = revision;
+        }
+
+        if ((strcmp(rev, "0002") == 0) ||
+            (strcmp(rev, "0003") == 0)) {
+            info->p1_revision = 1;
+        } else if ((strcmp(rev, "0004") == 0) ||
+                   (strcmp(rev, "0005") == 0) ||
+                   (strcmp(rev, "0006") == 0) ||
+                   (strcmp(rev, "0007") == 0) ||
+                   (strcmp(rev, "0008") == 0) ||
+                   (strcmp(rev, "0009") == 0) ||
+                   (strcmp(rev, "000d") == 0) ||
+                   (strcmp(rev, "000e") == 0) ||
+                   (strcmp(rev, "000f") == 0)) {
+            info->p1_revision = 2;
+        } else if (strcmp(rev, "0011") == 0) {
+            info->p1_revision = 0;  // compute module
+        } else {   // assume B+ (0010) or A+ (0012) or RPi2
+            info->p1_revision = 3;
+        }
+   }
+   return 0;
+}
+
+/*
+
+32 bits
+NEW                   23: will be 1 for the new scheme, 0 for the old scheme
+MEMSIZE             20: 0=256M 1=512M 2=1G
+MANUFACTURER  16: 0=SONY 1=EGOMAN
+PROCESSOR         12: 0=2835 1=2836
+TYPE                   04: 0=MODELA 1=MODELB 2=MODELA+ 3=MODELB+ 4=Pi2 MODEL B 5=ALPHA 6=CM
+REV                     00: 0=REV0 1=REV1 2=REV2
+
+pi2 = 1<<23 | 2<<20 | 1<<12 | 4<<4 = 0xa01040
+
+--------------------
+
+SRRR MMMM PPPP TTTT TTTT VVVV
+
+S scheme (0=old, 1=new)
+R RAM (0=256, 1=512, 2=1024)
+M manufacturer (0='SONY',1='EGOMAN',2='EMBEST',3='UNKNOWN',4='EMBEST')
+P processor (0=2835, 1=2836)
+T type (0='A', 1='B', 2='A+', 3='B+', 4='Pi 2 B', 5='Alpha', 6='Compute Module')
+V revision (0-15)
+
+*/
+