Some brainstorming on dependencies, transitions, service types

1 files changed, 6 insertions, 19 deletions

diff --git a/src/include/s6-rc/event.h b/src/include/s6-rc/event.h
index 8a08dcb..f99b571 100644
--- a/src/include/s6-rc/event.h
+++ b/src/include/s6-rc/event.h
@@ -5,28 +5,15 @@
 
 #include <stdint.h>
 
-
-typedef enum s6rc_eventtype_e s6rc_eventtype_t, *s6rc_eventtype_t_ref ;
-enum s6rc_eventtype_e
-{
-  S6RC_EVENTTYPE_WANTED_STATE_DOWN,
-  S6RC_EVENTTYPE_WANTED_STATE_UP,
-  S6RC_EVENTTYPE_CURRENT_STATE_DOWN,
-  S6RC_EVENTTYPE_CURRENT_STATE_UP,
-  S6RC_EVENTTYPE_TRANSITION_STOP,
-  S6RC_EVENTTYPE_TRANSITION_START,
-  S6RC_EVENTTYPE_CUSTOM,  /* for misc events from other processes */
-  S6RC_EVENTTYPE_PHAIL
-} ;
-
 typedef struct s6rc_event_s s6rc_event_t, *s6rc_event_t_ref ;
 struct s6rc_event_s
 {
-  char const *name ;
-  uint32_t value ;
-  uint8_t type : 3 ;
-  uint8_t extra : 5 ;
+  uint32_t name ;
+  uint32_t instance ;
+  uint8_t wanted : 1 ;
+  uint8_t up : 1 ;
+  uint8_t extra : 6 ;
 } ;
-#define S6RC_EVENT_ZERO { .name = 0, .value = 0, .type = S6RC_EVENTTYPE_PHAIL, .extra = 0 }
+#define S6RC_EVENT_ZERO { .name = 0, .instance = 0, .wanted = 0, .updown = 0, .extra = 0 }
 
 #endif