rpi_gpio 0.3.3 → 0.4.0

data/ext/rpi_gpio/c_gpio.h

@@ -1,7 +1,7 @@
 /*
 Original code by Ben Croston modified for Ruby by Nick Lowery
 (github.com/clockvapor)
-Copyright (c) 2014-2016 Nick Lowery
+Copyright (c) 2014-2020 Nick Lowery
 
 Copyright (c) 2013-2015 Ben Croston
 
@@ -36,10 +36,10 @@ 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 SETUP_OK           0
+#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
 

data/ext/rpi_gpio/common.c

@@ -1,7 +1,7 @@
 /*
 Original code by Ben Croston modified for Ruby by Nick Lowery
 (github.com/clockvapor)
-Copyright (c) 2014-2016 Nick Lowery
+Copyright (c) 2014-2020 Nick Lowery
 
 Copyright (c) 2013-2014 Ben Croston
 
@@ -47,8 +47,7 @@ int check_gpio_priv(void)
     // check mmap setup has worked
     if (!module_setup)
     {
-        rb_raise(rb_eRuntimeError, "no access to /dev/mem.  Try "
-          "running as root!");
+        rb_raise(rb_eRuntimeError, "no access to /dev/mem.  Try running as root!");
         return 2;
     }
     return 0;
@@ -67,10 +66,8 @@ int get_gpio_number(int channel, unsigned int *gpio)
 
     // 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))
+      || (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;
@@ -81,8 +78,7 @@ int get_gpio_number(int channel, unsigned int *gpio)
     {
         if (*(*pin_to_gpio+channel) == -1)
         {
-            rb_raise(rb_eArgError, "the channel sent is invalid on a Raspberry "
-              "Pi");
+            rb_raise(rb_eArgError, "the channel sent is invalid on a Raspberry Pi");
             return 5;
         } else {
             *gpio = *(*pin_to_gpio+channel);

data/ext/rpi_gpio/common.h

@@ -1,7 +1,7 @@
 /*
 Original code by Ben Croston modified for Ruby by Nick Lowery
 (github.com/clockvapor)
-Copyright (c) 2014-2016 Nick Lowery
+Copyright (c) 2014-2020 Nick Lowery
 
 Copyright (c) 2013-2015 Ben Croston
 

data/ext/rpi_gpio/cpuinfo.c

@@ -1,9 +1,9 @@
 /*
 Original code by Ben Croston modified for Ruby by Nick Lowery
 (github.com/clockvapor)
-Copyright (c) 2014-2016 Nick Lowery
+Copyright (c) 2014-2020 Nick Lowery
 
-Copyright (c) 2013-2016 Ben Croston
+Copyright (c) 2012-2019 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
@@ -24,9 +24,15 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
+/* See the following for up to date information:
+ * https://www.raspberrypi.org/documentation/hardware/raspberrypi/revision-codes/README.md
+ */
+
 #include <stdio.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
+#include <arpa/inet.h>
 #include "cpuinfo.h"
 
 int get_rpi_info(rpi_info *info)
@@ -35,24 +41,33 @@ int get_rpi_info(rpi_info *info)
    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 ||
-          strcmp(hardware, "BCM2837") == 0 ) {
-         found = 1;
+   if ((fp = fopen("/proc/device-tree/system/linux,revision", "r"))) {
+      uint32_t n;
+      if (fread(&n, sizeof(n), 1, fp) != 1) {
+         fclose(fp);
+         return -1;
       }
-      sscanf(buffer, "Revision	: %s", revision);
+      sprintf(revision, "%x", ntohl(n));
+      found = 1;
    }
+   else if ((fp = fopen("/proc/cpuinfo", "r"))) {
+      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 ||
+             strcmp(hardware, "BCM2837") == 0 ) {
+            found = 1;
+         }
+         sscanf(buffer, "Revision	: %s", revision);
+      }
+   }
+   else
+      return -1;
    fclose(fp);
 
    if (!found)
@@ -65,36 +80,56 @@ int get_rpi_info(rpi_info *info)
       // 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 = "Pi 2 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;
-                  case '8': info->type = "Pi 3 Model B"; info->p1_revision = 3; break;
-                  case '9': info->type = "Zero"; info->p1_revision = 3; 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;
-                  case '2': info->processor = "BCM2837"; 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;
+      switch (revision[len-3]) {
+         case '0' :
+            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 = "Pi 2 Model B"; info->p1_revision = 3; break;
+               case '5': info->type = "Alpha"; info->p1_revision = 3; break;
+               case '6': info->type = "Compute Module 1"; info->p1_revision = 0; break;
+               case '8': info->type = "Pi 3 Model B"; info->p1_revision = 3; break;
+               case '9': info->type = "Zero"; info->p1_revision = 3; break;
+               case 'a': info->type = "Compute Module 3"; info->p1_revision = 0; break;
+               case 'c': info->type = "Zero W"; info->p1_revision = 3; break;
+               case 'd': info->type = "Pi 3 Model B+"; info->p1_revision = 3; break;
+               case 'e': info->type = "Pi 3 Model A+"; info->p1_revision = 3; break;
+               default : info->type = "Unknown"; info->p1_revision = 3; break;
+            } break;
+         case '1':
+            switch (revision[len-2]) {
+               case '0': info->type = "Compute Module 3+"; info->p1_revision = 0; break;
+               case '1': info->type = "Pi 4 Model B"; info->p1_revision = 3; break;
+               default : info->type = "Unknown"; info->p1_revision = 3; break;
+            } 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;
+         case '2': info->processor = "BCM2837"; break;
+         case '3': info->processor = "BCM2711"; 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 '3': info->manufacturer = "Sony Japan"; break;
+         case '4': info->manufacturer = "Embest"; break;
+         case '5': info->manufacturer = "Stadium"; 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 = "1G"; break;
+         case 3: info->ram = "2G"; break;
+         case 4: info->ram = "4G"; break;
+         default: info->ram = "Unknown"; break;
       }
    } else {
       // old scheme
@@ -104,88 +139,105 @@ int get_rpi_info(rpi_info *info)
       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;
+      uint64_t rev;
+      sscanf(revision, "%llx", &rev);
+      rev = rev & 0xefffffff;       // ignore preceeding 1000 for overvolt
 
-      if ((strcmp(rev, "0002") == 0) ||
-          (strcmp(rev, "0003") == 0)) {
+      if (rev == 0x0002 || rev == 0x0003) {
          info->type = "Model B";
          info->p1_revision = 1;
          info->ram = "256M";
+         info->manufacturer = "Egoman";
          info->processor = "BCM2835";
-      } else if (strcmp(rev, "0004") == 0) {
+      } else if (rev == 0x0004) {
          info->type = "Model B";
          info->p1_revision = 2;
          info->ram = "256M";
-         info->manufacturer = "Sony";
+         info->manufacturer = "Sony UK";
          info->processor = "BCM2835";
-      } else if (strcmp(rev, "0005") == 0) {
+      } else if (rev == 0x0005) {
          info->type = "Model B";
          info->p1_revision = 2;
          info->ram = "256M";
          info->manufacturer = "Qisda";
          info->processor = "BCM2835";
-      } else if (strcmp(rev, "0006") == 0) {
+      } else if (rev == 0x0006) {
          info->type = "Model B";
          info->p1_revision = 2;
          info->ram = "256M";
          info->manufacturer = "Egoman";
          info->processor = "BCM2835";
-      } else if (strcmp(rev, "0007") == 0) {
+      } else if (rev == 0x0007) {
          info->type = "Model A";
          info->p1_revision = 2;
          info->ram = "256M";
          info->manufacturer = "Egoman";
          info->processor = "BCM2835";
-      } else if (strcmp(rev, "0008") == 0) {
+      } else if (rev == 0x0008) {
          info->type = "Model A";
          info->p1_revision = 2;
          info->ram = "256M";
-         info->manufacturer = "Sony";
+         info->manufacturer = "Sony UK";
          info->processor = "BCM2835";
-      } else if (strcmp(rev, "0009") == 0) {
+      } else if (rev == 0x0009) {
          info->type = "Model A";
          info->p1_revision = 2;
          info->ram = "256M";
          info->manufacturer = "Qisda";
          info->processor = "BCM2835";
-      } else if (strcmp(rev, "000d") == 0) {
+      } else if (rev == 0x000d) {
          info->type = "Model B";
          info->p1_revision = 2;
          info->ram = "512M";
          info->manufacturer = "Egoman";
          info->processor = "BCM2835";
-      } else if (strcmp(rev, "000e") == 0) {
+      } else if (rev == 0x000e) {
          info->type = "Model B";
          info->p1_revision = 2;
          info->ram = "512M";
-         info->manufacturer = "Sony";
+         info->manufacturer = "Sony UK";
          info->processor = "BCM2835";
-      } else if (strcmp(rev, "000f") == 0) {
+      } else if (rev == 0x000f) {
          info->type = "Model B";
          info->p1_revision = 2;
          info->ram = "512M";
          info->manufacturer = "Qisda";
          info->processor = "BCM2835";
-      } else if ((strcmp(rev, "0011") == 0) ||
-                 (strcmp(rev, "0014") == 0)) {
-         info->type = "Compute Module";
+      } else if (rev == 0x0010) {
+         info->type = "Model B+";
+         info->p1_revision = 3;
+         info->ram = "512M";
+         info->manufacturer = "Sony UK";
+         info->processor = "BCM2835";
+      } else if (rev == 0x0011) {
+         info->type = "Compute Module 1";
          info->p1_revision = 0;
          info->ram = "512M";
+         info->manufacturer = "Sony UK";
          info->processor = "BCM2835";
-      } else if (strcmp(rev, "0012") == 0) {
+      } else if (rev == 0x0012) {
          info->type = "Model A+";
          info->p1_revision = 3;
          info->ram = "256M";
+         info->manufacturer = "Sony UK";
          info->processor = "BCM2835";
-      } else if ((strcmp(rev, "0010") == 0) ||
-                 (strcmp(rev, "0013") == 0)) {
+      } else if (rev == 0x0013) {
          info->type = "Model B+";
          info->p1_revision = 3;
          info->ram = "512M";
+         info->manufacturer = "Embest";
+         info->processor = "BCM2835";
+      } else if (rev == 0x0014) {
+         info->type = "Compute Module 1";
+         info->p1_revision = 0;
+         info->ram = "512M";
+         info->manufacturer = "Embest";
+         info->processor = "BCM2835";
+      } else if (rev == 0x0015) {
+         info->type = "Model A+";
+         info->p1_revision = 3;
+         info->ram = "Unknown";
+         info->manufacturer = "Embest";
          info->processor = "BCM2835";
       } else {  // don't know - assume revision 3 p1 connector
          info->p1_revision = 3;

data/ext/rpi_gpio/cpuinfo.h

@@ -3,7 +3,7 @@ Original code by Ben Croston modified for Ruby by Nick Lowery
 (github.com/clockvapor)
 Copyright (c) 2014-2016 Nick Lowery
 
-Copyright (c) 2013-2016 Ben Croston
+Copyright (c) 2012-2015 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

data/ext/rpi_gpio/event_gpio.c

@@ -1,9 +1,9 @@
 /*
 Original code by Ben Croston modified for Ruby by Nick Lowery
 (github.com/clockvapor)
-Copyright (c) 2014-2016 Nick Lowery
+Copyright (c) 2014-2020 Nick Lowery
 
-Copyright (c) 2013-2016 Ben Croston
+Copyright (c) 2013-2018 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
@@ -28,6 +28,7 @@ SOFTWARE.
 #include <sys/epoll.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <string.h>
@@ -67,16 +68,34 @@ int epfd_thread = -1;
 int epfd_blocking = -1;
 
 /************* /sys/class/gpio functions ************/
+#define x_write(fd, buf, len) do {                                  \
+    size_t x_write_len = (len);                                     \
+                                                                    \
+    if ((size_t)write((fd), (buf), x_write_len) != x_write_len) {   \
+        close(fd);                                                  \
+        return (-1);                                                \
+    }                                                               \
+} while (/* CONSTCOND */ 0)
+
 int gpio_export(unsigned int gpio)
 {
     int fd, len;
     char str_gpio[3];
+    char filename[33];
 
-    if ((fd = open("/sys/class/gpio/export", O_WRONLY)) < 0)
+    snprintf(filename, sizeof(filename), "/sys/class/gpio/gpio%d", gpio);
+
+    /* return if gpio already exported */
+    if (access(filename, F_OK) != -1) {
+        return 0;
+    }
+
+    if ((fd = open("/sys/class/gpio/export", O_WRONLY)) < 0) {
        return -1;
+    }
 
     len = snprintf(str_gpio, sizeof(str_gpio), "%d", gpio);
-    write(fd, str_gpio, len);
+    x_write(fd, str_gpio, len);
     close(fd);
 
     return 0;
@@ -91,7 +110,7 @@ int gpio_unexport(unsigned int gpio)
         return -1;
 
     len = snprintf(str_gpio, sizeof(str_gpio), "%d", gpio);
-    write(fd, str_gpio, len);
+    x_write(fd, str_gpio, len);
     close(fd);
 
     return 0;
@@ -114,15 +133,13 @@ int gpio_set_direction(unsigned int gpio, unsigned int in_flag)
             break;
         nanosleep(&delay, NULL);
     }
-    if (retry >= 100) {
+    if (retry >= 100)
         return -1;
-    }
 
-    if (in_flag) {
-        write(fd, "in", 3);
-    } else {
-        write(fd, "out", 4);
-    }
+    if (in_flag)
+        x_write(fd, "in", 3);
+    else
+        x_write(fd, "out", 4);
 
     close(fd);
     return 0;
@@ -138,7 +155,7 @@ int gpio_set_edge(unsigned int gpio, unsigned int edge)
     if ((fd = open(filename, O_WRONLY)) < 0)
         return -1;
 
-    write(fd, stredge[edge], strlen(stredge[edge]) + 1);
+    x_write(fd, stredge[edge], strlen(stredge[edge]) + 1);
     close(fd);
     return 0;
 }
@@ -223,7 +240,6 @@ struct gpios *new_gpio(unsigned int gpio)
 void delete_gpio(unsigned int gpio)
 {
     struct gpios *g = gpio_list;
-    struct gpios *temp;
     struct gpios *prev = NULL;
 
     while (g != NULL) {
@@ -232,9 +248,7 @@ void delete_gpio(unsigned int gpio)
                 gpio_list = g->next;
             else
                 prev->next = g->next;
-            temp = g;
-            g = g->next;
-            free(temp);
+            free(g);
             return;
         } else {
             prev = g;
@@ -337,10 +351,7 @@ void *poll_thread(void *threadarg)
 
     thread_running = 1;
     while (thread_running) {
-        if ((n = epoll_wait(epfd_thread, &events, 1, -1)) == -1) {
-            thread_running = 0;
-            pthread_exit(NULL);
-        }
+        n = epoll_wait(epfd_thread, &events, 1, -1);
         if (n > 0) {
             lseek(events.data.fd, 0, SEEK_SET);
             if (read(events.data.fd, &buf, 1) != 1) {
@@ -353,12 +364,21 @@ void *poll_thread(void *threadarg)
             } else {
                 gettimeofday(&tv_timenow, NULL);
                 timenow = tv_timenow.tv_sec*1E6 + tv_timenow.tv_usec;
-                if (g->bouncetime == -666 || timenow - g->lastcall > g->bouncetime*1000 || g->lastcall == 0 || g->lastcall > timenow) {
+                if (g->bouncetime == -666 || timenow - g->lastcall > (unsigned int)g->bouncetime*1000 || g->lastcall == 0 || g->lastcall > timenow) {
                     g->lastcall = timenow;
                     event_occurred[g->gpio] = 1;
                     run_callbacks(g->gpio);
                 }
             }
+        } else if (n == -1) {
+            /*  If a signal is received while we are waiting,
+                epoll_wait will return with an EINTR error.
+                Just try again in that case.  */
+            if (errno == EINTR) {
+                continue;
+            }
+            thread_running = 0;
+            pthread_exit(NULL);
         }
     }
     thread_running = 0;
@@ -406,26 +426,29 @@ int event_detected(unsigned int gpio)
     }
 }
 
-void event_cleanup(unsigned int gpio)
+void event_cleanup(int gpio)
 // gpio of -666 means clean every channel used
 {
     struct gpios *g = gpio_list;
-    struct gpios *temp = NULL;
+    struct gpios *next_gpio = NULL;
 
     while (g != NULL) {
-        if ((gpio == -666) || (g->gpio == gpio))
-            temp = g->next;
+        next_gpio = g->next;
+        if ((gpio == -666) || ((int)g->gpio == gpio))
             remove_edge_detect(g->gpio);
-            g = temp;
+        g = next_gpio;
     }
-    if (gpio_list == NULL)
-        if (epfd_blocking != -1)
+    if (gpio_list == NULL) {
+        if (epfd_blocking != -1) {
             close(epfd_blocking);
             epfd_blocking = -1;
-        if (epfd_thread != -1)
+        }
+        if (epfd_thread != -1) {
             close(epfd_thread);
             epfd_thread = -1;
+        }
         thread_running = 0;
+    }
 }
 
 void event_cleanup_all(void)
@@ -447,13 +470,14 @@ int add_edge_detect(unsigned int gpio, unsigned int edge, int bouncetime)
 
     i = gpio_event_added(gpio);
     if (i == 0) {    // event not already added
-        if ((g = new_gpio(gpio)) == NULL)
+        if ((g = new_gpio(gpio)) == NULL) {
             return 2;
+        }
 
         gpio_set_edge(gpio, edge);
         g->edge = edge;
         g->bouncetime = bouncetime;
-    } else if (i == edge) {  // get existing event
+    } else if (i == (int)edge) {  // get existing event
         g = get_gpio(gpio);
         if ((bouncetime != -666 && g->bouncetime != bouncetime) ||  // different event bouncetime used
             (g->thread_added))                // event already added
@@ -501,13 +525,12 @@ int blocking_wait_for_edge(unsigned int gpio, unsigned int edge, int bouncetime,
     int finished = 0;
     int initial_edge = 1;
 
-    if (callback_exists(gpio)) {
+    if (callback_exists(gpio))
         return -1;
-    }
 
     // add gpio if it has not been added already
     ed = gpio_event_added(gpio);
-    if (ed == edge) {   // get existing record
+    if (ed == (int)edge) {   // get existing record
         g = get_gpio(gpio);
         if (g->bouncetime != -666 && g->bouncetime != bouncetime) {
             return -1;
@@ -541,16 +564,23 @@ int blocking_wait_for_edge(unsigned int gpio, unsigned int edge, int bouncetime,
 
     // wait for edge
     while (!finished) {
-        if ((n = epoll_wait(epfd_blocking, &events, 1, timeout)) == -1) {
+        n = epoll_wait(epfd_blocking, &events, 1, timeout);
+        if (n == -1) {
+            /*  If a signal is received while we are waiting,
+                epoll_wait will return with an EINTR error.
+                Just try again in that case.  */
+            if (errno == EINTR) {
+                continue;
+            }
             epoll_ctl(epfd_blocking, EPOLL_CTL_DEL, g->value_fd, &ev);
             return -2;
         }
-        if (initial_edge) { // first time triggers with current state, so ignore  
+        if (initial_edge) {    // first time triggers with current state, so ignore
             initial_edge = 0;
         } else {
             gettimeofday(&tv_timenow, NULL);
             timenow = tv_timenow.tv_sec*1E6 + tv_timenow.tv_usec;
-            if (g->bouncetime == -666 || timenow - g->lastcall > g->bouncetime*1000 || g->lastcall == 0 || g->lastcall > timenow) {
+            if (g->bouncetime == -666 || timenow - g->lastcall > (unsigned int)g->bouncetime*1000 || g->lastcall == 0 || g->lastcall > timenow) {
                 g->lastcall = timenow;
                 finished = 1;
             }