close #14, #15

thortex · Sep 14, 2016 · 22be047 · 22be047
1 parent f7445dc
commit 22be047
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/webiopi_0.7.1/python/native/cpuinfo.c b/webiopi_0.7.1/python/native/cpuinfo.c
@@ -35,7 +35,7 @@ int get_rpi_revision(void)
    ret = get_rpi_info(&info);
 
    if (0 == ret) {
-      return info->p1_revision;
+      return info.p1_revision;
    } else {
       return -1;
    }

diff --git a/webiopi_0.7.1/python/native/gpio.c b/webiopi_0.7.1/python/native/gpio.c
@@ -108,7 +108,7 @@ int setup(void)
 {
     int mem_fd;
     uint8_t *gpio_mem;
-    uint32_t peri_base;
+    uint32_t peri_base = BCM2709_PERI_BASE_DEFAULT;
     uint32_t gpio_base;
     unsigned char buf[4];
     FILE *fp;
@@ -143,8 +143,9 @@ int setup(void)
             return SETUP_CPUINFO_FAIL;
 
         while(!feof(fp) && !found) {
-            fgets(buffer, sizeof(buffer), fp);
-            sscanf(buffer, "Hardware	: %s", hardware);
+            if (fgets(buffer, sizeof(buffer), fp)) {
+                sscanf(buffer, "Hardware	: %s", hardware);
+            }
             if (strcmp(hardware, "BCM2708") == 0 || strcmp(hardware, "BCM2835") == 0) {
                 // pi 1 hardware
                 peri_base = BCM2708_PERI_BASE_DEFAULT;

diff --git a/webiopi_0.7.1/python/native/gpio.h b/webiopi_0.7.1/python/native/gpio.h
@@ -24,6 +24,8 @@ SOFTWARE.
 #define SETUP_DEVMEM_FAIL 1
 #define SETUP_MALLOC_FAIL 2
 #define SETUP_MMAP_FAIL   3
+#define SETUP_CPUINFO_FAIL 4
+#define SETUP_NOT_RPI_FAIL 5
 
 #define GPIO_COUNT 54