X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fdrivers%2Fao_event.c;h=d9d1d375fcb86f3453e1ea8cae95da62c475d88b;hp=440ef2de6d0ecd9f89a2359ce5387a9dcfd1e820;hb=7f46240dfc57164f0c1b0c4c4ed9695bca63860d;hpb=5ed88fb72c3e3ecf3333c700d838667db71cfbdc

diff --git a/src/drivers/ao_event.c b/src/drivers/ao_event.c
index 440ef2de..d9d1d375 100644
--- a/src/drivers/ao_event.c
+++ b/src/drivers/ao_event.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -25,17 +26,12 @@
 #define ao_event_queue_empty()	(ao_event_queue_insert == ao_event_queue_remove)
 #define ao_event_queue_full()	(ao_event_queue_next(ao_event_queue_insert) == ao_event_queue_remove)
 
-/*
- * Whether a sequence of events from the same device should be collapsed
- */
-#define ao_event_can_collapse(type)	((type) == AO_EVENT_QUADRATURE)
-
 struct ao_event ao_event_queue[AO_EVENT_QUEUE];
 uint8_t		ao_event_queue_insert;
 uint8_t		ao_event_queue_remove;
 
 
-uint8_t
+void
 ao_event_get(struct ao_event *ev)
 {
 	ao_arch_critical(
@@ -46,19 +42,27 @@ ao_event_get(struct ao_event *ev)
 		);
 }
 
+uint8_t
+ao_event_get_for(struct ao_event *ev, AO_TICK_TYPE timeout)
+{
+	uint8_t	empty = 1;
+	ao_arch_critical(
+		while ((empty = ao_event_queue_empty()))
+			if (ao_sleep_for(&ao_event_queue, timeout))
+				break;
+		if (!empty) {
+			*ev = ao_event_queue[ao_event_queue_remove];
+			ao_event_queue_remove = ao_event_queue_next(ao_event_queue_remove);
+		}
+		);
+	return empty;
+}
+
 /* called with interrupts disabled */
 void
-ao_event_put_isr(uint8_t type, uint8_t unit, uint32_t value)
+ao_event_put_isr(uint8_t type, uint8_t unit, int32_t value)
 {
 	if (!ao_event_queue_full()) {
-
-		if (ao_event_can_collapse(type) && !ao_event_queue_empty()) {
-			uint8_t	prev = ao_event_queue_prev(ao_event_queue_insert);
-
-			if (ao_event_queue[prev].type == type &&
-			    ao_event_queue[prev].unit == unit)
-				ao_event_queue_insert = prev;
-		}
 		ao_event_queue[ao_event_queue_insert] = (struct ao_event) {
 			.type = type,
 			.unit = unit,
@@ -71,7 +75,7 @@ ao_event_put_isr(uint8_t type, uint8_t unit, uint32_t value)
 }
 
 void
-ao_event_put(uint8_t type, uint8_t unit, uint32_t value)
+ao_event_put(uint8_t type, uint8_t unit, int32_t value)
 {
 	ao_arch_critical(ao_event_put_isr(type, unit, value););
 }