Add support for exception events

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

2 files changed, 16 insertions, 3 deletions

diff --git a/events.c b/events.c
index 461e641..7e71e42 100644
--- a/events.c
+++ b/events.c
@@ -67,6 +67,9 @@ void events_watch_fd(struct events *events, int fd,
 	case OMAP3_ISP_EVENT_WRITE:
 		FD_SET(fd, &events->wfds);
 		break;
+	case OMAP3_ISP_EVENT_EXCEPTION:
+		FD_SET(fd, &events->efds);
+		break;
 	}
 
 	events->maxfd = max(events->maxfd, fd);
@@ -97,6 +100,9 @@ void events_unwatch_fd(struct events *events, int fd)
 	case OMAP3_ISP_EVENT_WRITE:
 		FD_CLR(fd, &events->wfds);
 		break;
+	case OMAP3_ISP_EVENT_EXCEPTION:
+		FD_CLR(fd, &events->efds);
+		break;
 	}
 
 	events->maxfd = maxfd;
@@ -106,7 +112,7 @@ void events_unwatch_fd(struct events *events, int fd)
 }
 
 static void events_dispatch(struct events *events, const fd_set *rfds,
-			    const fd_set *wfds)
+			    const fd_set *wfds, const fd_set *efds)
 {
 	struct event_fd *event;
 
@@ -117,6 +123,9 @@ static void events_dispatch(struct events *events, const fd_set *rfds,
 		if (event->type == OMAP3_ISP_EVENT_WRITE &&
 		    FD_ISSET(event->fd, wfds))
 			event->callback(event->priv);
+		if (event->type == OMAP3_ISP_EVENT_EXCEPTION &&
+		    FD_ISSET(event->fd, efds))
+			event->callback(event->priv);
 	}
 }
 
@@ -126,14 +135,16 @@ bool events_loop(struct events *events)
 		struct timeval timeout;
 		fd_set rfds;
 		fd_set wfds;
+		fd_set efds;
 		int ret;
 
 		timeout.tv_sec = SELECT_TIMEOUT / 1000;
 		timeout.tv_usec = (SELECT_TIMEOUT % 1000) * 1000;
 		rfds = events->rfds;
 		wfds = events->wfds;
+		efds = events->efds;
 
-		ret = select(events->maxfd + 1, &rfds, &wfds, NULL, &timeout);
+		ret = select(events->maxfd + 1, &rfds, &wfds, &efds, &timeout);
 		if (ret < 0) {
 			/* EINTR means that a signal has been received, continue
 			 * to the next iteration in that case.
@@ -153,7 +164,7 @@ bool events_loop(struct events *events)
 			break;
 		}
 
-		events_dispatch(events, &rfds, &wfds);
+		events_dispatch(events, &rfds, &wfds, &efds);
 	}
 
 	return !events->done;
@@ -170,6 +181,7 @@ void events_init(struct events *events)
 
 	FD_ZERO(&events->rfds);
 	FD_ZERO(&events->wfds);
+	FD_ZERO(&events->efds);
 	events->maxfd = 0;
 	list_init(&events->events);
 }
diff --git a/events.h b/events.h
index 00a14bf..7b038b4 100644
--- a/events.h
+++ b/events.h
@@ -35,6 +35,7 @@ struct events {
 	int maxfd;
 	fd_set rfds;
 	fd_set wfds;
+	fd_set efds;
 };
 
 void events_watch_fd(struct events *events, int fd,