rpi_gpio 0.2.0 → 0.3.0

data/ext/new/common.h

@@ -1,43 +0,0 @@
-/*
-Copyright (c) 2013-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
-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/new/constants.c

@@ -1,84 +0,0 @@
-/*
-Copyright (c) 2013-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
-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 "Python.h"
-#include "constants.h"
-#include "common.h"
-#include "c_gpio.h"
-#include "event_gpio.h"
-
-void define_constants(PyObject *module)
-{
-   high = Py_BuildValue("i", HIGH);
-   PyModule_AddObject(module, "HIGH", high);
-
-   low = Py_BuildValue("i", LOW);
-   PyModule_AddObject(module, "LOW", low);
-
-   output = Py_BuildValue("i", OUTPUT);
-   PyModule_AddObject(module, "OUT", output);
-
-   input = Py_BuildValue("i", INPUT);
-   PyModule_AddObject(module, "IN", input);
-
-   pwm = Py_BuildValue("i", PWM);
-   PyModule_AddObject(module, "HARD_PWM", pwm);
-
-   serial = Py_BuildValue("i", SERIAL);
-   PyModule_AddObject(module, "SERIAL", serial);
-
-   i2c = Py_BuildValue("i", I2C);
-   PyModule_AddObject(module, "I2C", i2c);
-
-   spi = Py_BuildValue("i", SPI);
-   PyModule_AddObject(module, "SPI", spi);
-
-   unknown = Py_BuildValue("i", MODE_UNKNOWN);
-   PyModule_AddObject(module, "UNKNOWN", unknown);
-
-   board = Py_BuildValue("i", BOARD);
-   PyModule_AddObject(module, "BOARD", board);
-
-   bcm = Py_BuildValue("i", BCM);
-   PyModule_AddObject(module, "BCM", bcm);
-
-   pud_off = Py_BuildValue("i", PUD_OFF + PY_PUD_CONST_OFFSET);
-   PyModule_AddObject(module, "PUD_OFF", pud_off);
-
-   pud_up = Py_BuildValue("i", PUD_UP + PY_PUD_CONST_OFFSET);
-   PyModule_AddObject(module, "PUD_UP", pud_up);
-
-   pud_down = Py_BuildValue("i", PUD_DOWN + PY_PUD_CONST_OFFSET);
-   PyModule_AddObject(module, "PUD_DOWN", pud_down);
-
-   rising_edge = Py_BuildValue("i", RISING_EDGE + PY_EVENT_CONST_OFFSET);
-   PyModule_AddObject(module, "RISING", rising_edge);
-
-   falling_edge = Py_BuildValue("i", FALLING_EDGE + PY_EVENT_CONST_OFFSET);
-   PyModule_AddObject(module, "FALLING", falling_edge);
-
-   both_edge = Py_BuildValue("i", BOTH_EDGE + PY_EVENT_CONST_OFFSET);
-   PyModule_AddObject(module, "BOTH", both_edge);
-
-   version = Py_BuildValue("s", "0.5.11");
-   PyModule_AddObject(module, "VERSION", version);
-}

data/ext/new/constants.h

@@ -1,45 +0,0 @@
-/*
-Copyright (c) 2013 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 PY_PUD_CONST_OFFSET 20
-#define PY_EVENT_CONST_OFFSET 30
-
-PyObject *high;
-PyObject *low;
-PyObject *input;
-PyObject *output;
-PyObject *pwm;
-PyObject *serial;
-PyObject *i2c;
-PyObject *spi;
-PyObject *unknown;
-PyObject *board;
-PyObject *bcm;
-PyObject *pud_off;
-PyObject *pud_up;
-PyObject *pud_down;
-PyObject *rising_edge;
-PyObject *falling_edge;
-PyObject *both_edge;
-PyObject *version;
-
-void define_constants(PyObject *module);

data/ext/new/cpuinfo.c

@@ -1,149 +0,0 @@
-/*
-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
-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)
-
-*/

data/ext/new/cpuinfo.h

@@ -1,36 +0,0 @@
-/*
-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
-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 CPUINFO_H
-#define CPUINFO_H
-typedef struct
-{
-   int p1_revision;
-   char *ram;
-   char *manufacturer;
-   char *processor;
-   char *type;
-   char revision[1024];
-} rpi_info;
-#endif /* CPUINFO_H */
-
-int get_rpi_info(rpi_info *info);

data/ext/new/event_gpio.c

@@ -1,550 +0,0 @@
-/*
-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 <pthread.h>
-#include <sys/epoll.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/time.h>
-#include "event_gpio.h"
-
-const char *stredge[4] = {"none", "rising", "falling", "both"};
-
-struct gpios
-{
-    unsigned int gpio;
-    int value_fd;
-    int exported;
-    int edge;
-    int initial_thread;
-    int initial_wait;
-    int thread_added;
-    int bouncetime;
-    unsigned long long lastcall;
-    struct gpios *next;
-};
-struct gpios *gpio_list = NULL;
-
-// event callbacks
-struct callback
-{
-    unsigned int gpio;
-    void (*func)(unsigned int gpio);
-    struct callback *next;
-};
-struct callback *callbacks = NULL;
-
-pthread_t threads;
-int event_occurred[54] = { 0 };
-int thread_running = 0;
-int epfd_thread = -1;
-int epfd_blocking = -1;
-
-/************* /sys/class/gpio functions ************/
-int gpio_export(unsigned int gpio)
-{
-    int fd, len;
-    char str_gpio[3];
-
-    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);
-    close(fd);
-
-    return 0;
-}
-
-int gpio_unexport(unsigned int gpio)
-{
-    int fd, len;
-    char str_gpio[3];
-
-    if ((fd = open("/sys/class/gpio/unexport", O_WRONLY)) < 0)
-        return -1;
-
-    len = snprintf(str_gpio, sizeof(str_gpio), "%d", gpio);
-    write(fd, str_gpio, len);
-    close(fd);
-
-    return 0;
-}
-
-int gpio_set_direction(unsigned int gpio, unsigned int in_flag)
-{
-    int fd;
-    char filename[33];
-
-    snprintf(filename, sizeof(filename), "/sys/class/gpio/gpio%d/direction", gpio);
-    if ((fd = open(filename, O_WRONLY)) < 0)
-        return -1;
-
-    if (in_flag)
-        write(fd, "in", 3);
-    else
-        write(fd, "out", 4);
-
-    close(fd);
-    return 0;
-}
-
-int gpio_set_edge(unsigned int gpio, unsigned int edge)
-{
-    int fd;
-    char filename[28];
-
-    snprintf(filename, sizeof(filename), "/sys/class/gpio/gpio%d/edge", gpio);
-
-    if ((fd = open(filename, O_WRONLY)) < 0)
-        return -1;
-
-    write(fd, stredge[edge], strlen(stredge[edge]) + 1);
-    close(fd);
-    return 0;
-}
-
-int open_value_file(unsigned int gpio)
-{
-    int fd;
-    char filename[29];
-
-    // create file descriptor of value file
-    snprintf(filename, sizeof(filename), "/sys/class/gpio/gpio%d/value", gpio);
-    if ((fd = open(filename, O_RDONLY | O_NONBLOCK)) < 0)
-        return -1;
-    return fd;
-}
-
-/********* gpio list functions **********/
-struct gpios *get_gpio(unsigned int gpio)
-{
-    struct gpios *g = gpio_list;
-    while (g != NULL) {
-        if (g->gpio == gpio)
-            return g;
-        g = g->next;
-    }
-    return NULL;
-}
-
-struct gpios *get_gpio_from_value_fd(int fd)
-{
-    struct gpios *g = gpio_list;
-    while (g != NULL) {
-        if (g->value_fd == fd)
-           return g;
-        g = g->next;
-    }
-    return NULL;
-}
-
-struct gpios *new_gpio(unsigned int gpio)
-{
-    struct gpios *new_gpio;
-
-    new_gpio = malloc(sizeof(struct gpios));
-    if (new_gpio == 0)
-        return NULL;  // out of memory
-
-    new_gpio->gpio = gpio;
-    if (gpio_export(gpio) != 0) {
-        free(new_gpio);
-        return NULL;
-    }
-    new_gpio->exported = 1;
-
-    if (gpio_set_direction(gpio,1) != 0) { // 1==input
-        free(new_gpio);
-        return NULL;
-    }
-
-    if ((new_gpio->value_fd = open_value_file(gpio)) == -1) {
-        gpio_unexport(gpio);
-        free(new_gpio);
-        return NULL;
-    }
-
-    new_gpio->initial_thread = 1;
-    new_gpio->initial_wait = 1;
-    new_gpio->bouncetime = -666;
-    new_gpio->lastcall = 0;
-    new_gpio->thread_added = 0;
-
-    if (gpio_list == NULL) {
-        new_gpio->next = NULL;
-    } else {
-        new_gpio->next = gpio_list;
-    }
-    gpio_list = new_gpio;
-    return new_gpio;
-}
-
-void delete_gpio(unsigned int gpio)
-{
-    struct gpios *g = gpio_list;
-    struct gpios *temp;
-    struct gpios *prev = NULL;
-
-    while (g != NULL) {
-        if (g->gpio == gpio) {
-            if (prev == NULL)
-                gpio_list = g->next;
-            else
-                prev->next = g->next;
-            temp = g;
-            g = g->next;
-            free(temp);
-            return;
-        } else {
-            prev = g;
-            g = g->next;
-        }
-    }
-}
-
-int gpio_event_added(unsigned int gpio)
-{
-    struct gpios *g = gpio_list;
-    while (g != NULL) {
-        if (g->gpio == gpio)
-            return g->edge;
-        g = g->next;
-    }
-    return 0;
-}
-
-/******* callback list functions ********/
-int add_edge_callback(unsigned int gpio, void (*func)(unsigned int gpio))
-{
-    struct callback *cb = callbacks;
-    struct callback *new_cb;
-
-    new_cb = malloc(sizeof(struct callback));
-    if (new_cb == 0)
-        return -1;  // out of memory
-
-    new_cb->gpio = gpio;
-    new_cb->func = func;
-    new_cb->next = NULL;
-
-    if (callbacks == NULL) {
-        // start new list
-        callbacks = new_cb;
-    } else {
-        // add to end of list
-        while (cb->next != NULL)
-            cb = cb->next;
-        cb->next = new_cb;
-    }
-    return 0;
-}
-
-int callback_exists(unsigned int gpio)
-{
-    struct callback *cb = callbacks;
-    while (cb != NULL) {
-        if (cb->gpio == gpio)
-            return 1;
-        cb = cb->next;
-    }
-    return 0;
-}
-
-void run_callbacks(unsigned int gpio)
-{
-    struct callback *cb = callbacks;
-    while (cb != NULL)
-    {
-        if (cb->gpio == gpio)
-            cb->func(cb->gpio);
-        cb = cb->next;
-    }
-}
-
-void remove_callbacks(unsigned int gpio)
-{
-    struct callback *cb = callbacks;
-    struct callback *temp;
-    struct callback *prev = NULL;
-
-    while (cb != NULL)
-    {
-        if (cb->gpio == gpio)
-        {
-            if (prev == NULL)
-                callbacks = cb->next;
-            else
-                prev->next = cb->next;
-            temp = cb;
-            cb = cb->next;
-            free(temp);
-        } else {
-            prev = cb;
-            cb = cb->next;
-        }
-    }
-}
-
-void *poll_thread(void *threadarg)
-{
-    struct epoll_event events;
-    char buf;
-    struct timeval tv_timenow;
-    unsigned long long timenow;
-    struct gpios *g;
-    int n;
-
-    thread_running = 1;
-    while (thread_running) {
-        if ((n = epoll_wait(epfd_thread, &events, 1, -1)) == -1) {
-            thread_running = 0;
-            pthread_exit(NULL);
-        }
-        if (n > 0) {
-            lseek(events.data.fd, 0, SEEK_SET);
-            if (read(events.data.fd, &buf, 1) != 1) {
-                thread_running = 0;
-                pthread_exit(NULL);
-            }
-            g = get_gpio_from_value_fd(events.data.fd);
-            if (g->initial_thread) {     // ignore first epoll trigger
-                g->initial_thread = 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) {
-                    g->lastcall = timenow;
-                    event_occurred[g->gpio] = 1;
-                    run_callbacks(g->gpio);
-                }
-            }
-        }
-    }
-    thread_running = 0;
-    pthread_exit(NULL);
-}
-
-void remove_edge_detect(unsigned int gpio)
-{
-    struct epoll_event ev;
-    struct gpios *g = get_gpio(gpio);
-
-    if (g == NULL)
-        return;
-
-    // delete epoll of fd
-
-    ev.events = EPOLLIN | EPOLLET | EPOLLPRI;
-    ev.data.fd = g->value_fd;
-    epoll_ctl(epfd_thread, EPOLL_CTL_DEL, g->value_fd, &ev);
-
-    // delete callbacks for gpio
-    remove_callbacks(gpio);
-
-    // btc fixme - check return result??
-    gpio_set_edge(gpio, NO_EDGE);
-    g->edge = NO_EDGE;
-
-    if (g->value_fd != -1)
-        close(g->value_fd);
-
-    // btc fixme - check return result??
-    gpio_unexport(gpio);
-    event_occurred[gpio] = 0;
-
-    delete_gpio(gpio);
-}
-
-int event_detected(unsigned int gpio)
-{
-    if (event_occurred[gpio]) {
-        event_occurred[gpio] = 0;
-        return 1;
-    } else {
-        return 0;
-    }
-}
-
-void event_cleanup(unsigned int gpio)
-// gpio of -666 means clean every channel used
-{
-    struct gpios *g = gpio_list;
-    struct gpios *temp = NULL;
-
-    while (g != NULL) {
-        if ((gpio == -666) || (g->gpio == gpio))
-            temp = g->next;
-            remove_edge_detect(g->gpio);
-            g = temp;
-    }
-    if (gpio_list == NULL)
-        if (epfd_blocking != -1)
-            close(epfd_blocking);
-            epfd_blocking = -1;
-        if (epfd_thread != -1)
-            close(epfd_thread);
-            epfd_thread = -1;
-        thread_running = 0;
-}
-
-void event_cleanup_all(void)
-{
-   event_cleanup(-666);
-}
-
-int add_edge_detect(unsigned int gpio, unsigned int edge, int bouncetime)
-// return values:
-// 0 - Success
-// 1 - Edge detection already added
-// 2 - Other error
-{
-    pthread_t threads;
-    struct epoll_event ev;
-    long t = 0;
-    struct gpios *g;
-    int i = -1;
-
-    i = gpio_event_added(gpio);
-    if (i == 0) {    // event not already added
-        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
-        g = get_gpio(gpio);
-        if ((bouncetime != -666 && g->bouncetime != bouncetime) ||  // different event bouncetime used
-            (g->thread_added))                // event already added
-            return 1;
-    } else {
-        return 1;
-    }
-
-    // create epfd_thread if not already open
-    if ((epfd_thread == -1) && ((epfd_thread = epoll_create(1)) == -1))
-        return 2;
-
-    // add to epoll fd
-    ev.events = EPOLLIN | EPOLLET | EPOLLPRI;
-    ev.data.fd = g->value_fd;
-    if (epoll_ctl(epfd_thread, EPOLL_CTL_ADD, g->value_fd, &ev) == -1) {
-        remove_edge_detect(gpio);
-        return 2;
-    }
-    g->thread_added = 1;
-
-    // start poll thread if it is not already running
-    if (!thread_running) {
-        if (pthread_create(&threads, NULL, poll_thread, (void *)t) != 0) {
-           remove_edge_detect(gpio);
-           return 2;
-        }
-    }
-    return 0;
-}
-
-int blocking_wait_for_edge(unsigned int gpio, unsigned int edge, int bouncetime)
-// return values:
-//    0 - Success
-//    1 - Edge detection already added
-//    2 - Other error
-{
-    int n, ed;
-    struct epoll_event events, ev;
-    char buf;
-    struct gpios *g = NULL;
-    struct timeval tv_timenow;
-    unsigned long long timenow;
-    int finished = 0;
-    int initial_edge = 1;
-
-    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
-        g = get_gpio(gpio);
-        if (g->bouncetime != -666 && g->bouncetime != bouncetime) {
-            return 1;
-        }
-    } else if (ed == NO_EDGE) {   // not found so add event
-        if ((g = new_gpio(gpio)) == NULL)
-            return 2;
-        gpio_set_edge(gpio, edge);
-        g->edge = edge;
-        g->bouncetime = bouncetime;
-    } else {    // ed != edge - event for a different edge
-        g = get_gpio(gpio);
-        gpio_set_edge(gpio, edge);
-        g->edge = edge;
-        g->bouncetime = bouncetime;
-        g->initial_wait = 1;
-    }
-
-    // create epfd_blocking if not already open
-    if ((epfd_blocking == -1) && ((epfd_blocking = epoll_create(1)) == -1)) {
-        return 2;
-    }
-
-    // add to epoll fd
-    ev.events = EPOLLIN | EPOLLET | EPOLLPRI;
-    ev.data.fd = g->value_fd;
-    if (epoll_ctl(epfd_blocking, EPOLL_CTL_ADD, g->value_fd, &ev) == -1) {
-        return 2;
-    }
-
-    // wait for edge
-    while (!finished) {
-        if ((n = epoll_wait(epfd_blocking, &events, 1, -1)) == -1) {
-            epoll_ctl(epfd_blocking, EPOLL_CTL_DEL, g->value_fd, &ev);
-            return 2;
-        }
-        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) {
-                g->lastcall = timenow;
-                finished = 1;
-            }
-        }
-    }
-
-    // check event was valid
-    if (n > 0) {
-        lseek(events.data.fd, 0, SEEK_SET);
-        if ((read(events.data.fd, &buf, 1) != 1) || (events.data.fd != g->value_fd)) {
-            epoll_ctl(epfd_blocking, EPOLL_CTL_DEL, g->value_fd, &ev);
-            return 2;
-        }
-    }
-
-    epoll_ctl(epfd_blocking, EPOLL_CTL_DEL, g->value_fd, &ev);
-    return 0;
-}