Raspberries/mraa
Private
Public Access
2
0
Fork 0
Code Activity

gpio.c: Handle subplatform interrupts

Browse Source 
For all subplaform pins, save the subplatform index as dev->pin and the
actual platform index as dev->phy_pin.

Example:
    pin 515 (subplatform pin 3)
    dev->pin = 515
    dev->phy_pin = 515 - 512 = 3

In this way, methods which get a mraa_gpio_context have a means
to tell whether the pin is on a subplatform or not.

Signed-off-by: Noel Eck <noel.eck@intel.com>
This commit is contained in:
Noel Eck
2018-06-18 14:41:31 -07:00
parent fc4b2a554d
commit c563e4fb4d
1 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/gpio/gpio.c
View File

@@ -172,8 +172,18 @@ mraa_gpio_init(int pin)
return NULL; return NULL;
} }
if (mraa_is_sub_platform_id(pin)) { /* If this pin belongs to a subplatform, then the pin member will contain
syslog(LOG_NOTICE, "gpio%i: init: Using sub platform", pin); * the mraa pin index and the phy_pin will contain the subplatform's
* pin index.
* example: pin 515, dev->pin = 515, dev->phy_pin = 3
*/
if (mraa_is_sub_platform_id(pin) && (board->sub_platform != NULL)) {
syslog(LOG_NOTICE, "gpio%i: initialised on sub platform '%s' physical pin: %i",
pin,
board->sub_platform->platform_name != NULL ?
board->sub_platform->platform_name : "",
mraa_get_sub_platform_index(pin));
board = board->sub_platform; board = board->sub_platform;
if (board == NULL) { if (board == NULL) {
syslog(LOG_ERR, "gpio%i: init: Sub platform not initialised", pin); syslog(LOG_ERR, "gpio%i: init: Sub platform not initialised", pin);
@@ -599,7 +609,10 @@ mraa_gpio_interrupt_handler(void* arg)
return NULL; return NULL;
} }
if (plat->chardev_capable) { /* Is this pin on a subplatform? Do nothing... */
if (mraa_is_sub_platform_id(dev->pin)) {}
/* Is the platform chardev_capable? */
else if (plat->chardev_capable) {
mraa_gpiod_group_t gpio_group; mraa_gpiod_group_t gpio_group;
for_each_gpio_group(gpio_group, dev) { for_each_gpio_group(gpio_group, dev) {
@@ -607,7 +620,9 @@ mraa_gpio_interrupt_handler(void* arg)
fps[idx++] = gpio_group->event_handles[i]; fps[idx++] = gpio_group->event_handles[i];
} }
} }
} else { }
/* Else, attempt fs access */
else {
mraa_gpio_context it = dev; mraa_gpio_context it = dev;
while (it) { while (it) {
@@ -901,7 +916,7 @@ mraa_gpio_isr_exit(mraa_gpio_context dev)
dev->isr_thread_terminating = 1; dev->isr_thread_terminating = 1;
// stop isr being useful // stop isr being useful
if (plat->chardev_capable) if (plat && (plat->chardev_capable))
_mraa_close_gpio_event_handles(dev); _mraa_close_gpio_event_handles(dev);
else else
ret = mraa_gpio_edge_mode(dev, MRAA_GPIO_EDGE_NONE); ret = mraa_gpio_edge_mode(dev, MRAA_GPIO_EDGE_NONE);
@@ -1561,7 +1576,10 @@ mraa_gpio_close(mraa_gpio_context dev)
free(dev->events); free(dev->events);
} }
if (plat->chardev_capable) { /* Free any ISRs */
mraa_gpio_isr_exit(dev);
if (plat && plat->chardev_capable) {
_mraa_free_gpio_groups(dev); _mraa_free_gpio_groups(dev);
free(dev); free(dev);