X-Git-Url: http://git.scottworley.com/tattlekey/blobdiff_plain/00ca9fa67636580409193bf7a9baf394113b4af8..e3ff9e0d326c0dfce08c7b9fb7aaa2b11245a6a5:/client/press.c

diff --git a/client/press.c b/client/press.c
index 49b2b9a..7a7f996 100644
--- a/client/press.c
+++ b/client/press.c
@@ -1,32 +1,46 @@
 #include "press.h"
+#include "blink.h"
 
 static uint32_t next_send(press_t *s) {
   return s->timestamp + (1 << s->send_count) - 1;
 }
 
-bool next_send_less_than(void *user_data, pheap_node_id_t a,
-                         pheap_node_id_t b) {
+static bool next_send_less_than(void *user_data, pheap_node_id_t a,
+                                pheap_node_id_t b) {
   press_t *presses = (press_t *)user_data;
   return next_send(&presses[a]) < next_send(&presses[b]);
 }
 
-void create_press(press_t *presses, pheap_t *sleeps_heap, uint32_t timestamp,
-                  u16_t seq) {
-  pheap_node_id_t i = ph_new_node(sleeps_heap);
+press_pile_t *create_press_pile() {
+  press_pile_t *pp = (press_pile_t *)malloc(sizeof(press_pile_t));
+  if (pp == NULL)
+    signal_error_by_blinking();
+  pp->presses = calloc(PICO_PHEAP_MAX_ENTRIES, sizeof(press_t));
+  if (pp->presses == NULL)
+    signal_error_by_blinking();
+  pp->sleeps_heap =
+      ph_create(PICO_PHEAP_MAX_ENTRIES, next_send_less_than, pp->presses);
+  if (pp->sleeps_heap == NULL)
+    signal_error_by_blinking();
+  return pp;
+}
+
+void create_press(press_pile_t *pp, uint32_t timestamp, u16_t seq) {
+  pheap_node_id_t i = ph_new_node(pp->sleeps_heap);
   if (i == 0) {
     /* TODO: Don't drop new presses just because sleeps_heap is full of old
      * presses. */
     return;
   }
-  presses[i].timestamp = timestamp;
-  presses[i].seq = seq;
-  presses[i].send_count = 0;
-  ph_insert_node(sleeps_heap, i);
+  pp->presses[i].timestamp = timestamp;
+  pp->presses[i].seq = seq;
+  pp->presses[i].send_count = 0;
+  ph_insert_node(pp->sleeps_heap, i);
 }
 
-int32_t next_scheduled_send(press_t *presses, pheap_t *sleeps_heap) {
-  pheap_node_id_t i = ph_peek_head(sleeps_heap);
+int32_t next_scheduled_send(press_pile_t *pp) {
+  pheap_node_id_t i = ph_peek_head(pp->sleeps_heap);
   if (i == 0)
     return -1;
-  return next_send(&presses[i]);
+  return next_send(&pp->presses[i]);
 }