seperated some event files

Signed-off-by: Jens Nyberg <jens.nyberg@gmail.com>

src/modules/event/main.c

@@ -2,9 +2,17 @@
 #include <kernel.h>
 #include <modules/system/system.h>
 
-static struct system_node root;
+static struct system_node eventnode;
+static struct system_node multicastnode;
 
-static unsigned int root_write(struct system_node *self, struct system_node *current, struct service_state *state, void *buffer, unsigned int count, unsigned int offset)
+static unsigned int eventnode_seek(struct system_node *self, struct service_state *state, unsigned int offset)
+{
+
+    return 0;
+
+}
+
+static unsigned int multicastnode_write(struct system_node *self, struct system_node *current, struct service_state *state, void *buffer, unsigned int count, unsigned int offset)
 {
 
     union event_message *message = buffer;
@@ -15,11 +23,11 @@ static unsigned int root_write(struct system_node *self, struct system_node *cur
     if (message->header.length != count)
         return 0;
 
-    return kernel_multicast(state->id, &self->states, message);
+    return kernel_multicast(state->id, &eventnode.states, message);
 
 }
 
-static unsigned int root_seek(struct system_node *self, struct service_state *state, unsigned int offset)
+static unsigned int multicastnode_seek(struct system_node *self, struct service_state *state, unsigned int offset)
 {
 
     return 0;
@@ -29,24 +37,30 @@ static unsigned int root_seek(struct system_node *self, struct service_state *st
 void module_init(void)
 {
 
-    system_initnode(&root, SYSTEM_NODETYPE_NORMAL, "event");
+    system_initnode(&eventnode, SYSTEM_NODETYPE_NORMAL, "event");
+
+    eventnode.operations.seek = eventnode_seek;
+
+    system_initnode(&multicastnode, SYSTEM_NODETYPE_NORMAL, "multicast");
 
-    root.operations.write = root_write;
-    root.operations.seek = root_seek;
+    multicastnode.operations.write = multicastnode_write;
+    multicastnode.operations.seek = multicastnode_seek;
 
 }
 
 void module_register(void)
 {
 
-    system_registernode(&root);
+    system_registernode(&eventnode);
+    system_registernode(&multicastnode);
 
 }
 
 void module_unregister(void)
 {
 
-    system_unregisternode(&root);
+    system_unregisternode(&eventnode);
+    system_unregisternode(&multicastnode);
 
 }
 

src/wm/wedit.c

@@ -286,9 +286,11 @@ void main(void)
     union event_message imessage;
     union event_message omessage;
 
-    if (!file_walk2(FILE_G0, "/system/event"))
+    if (!file_walk2(FILE_G0, "/system/multicast"))
         return;
 
+    file_open(FILE_G0);
+
     while (!status)
     {
 
@@ -349,5 +351,7 @@ void main(void)
 
     }
 
+    file_close(FILE_G0);
+
 }
 

src/wm/wm.c

@@ -315,7 +315,7 @@ static void setupremotes(void)
 static unsigned int ondata(union event_message *imessage, union event_message *omessage)
 {
 
-    if (!file_walk(FILE_L0, FILE_G3, "../data"))
+    if (!file_walk(FILE_L0, FILE_G4, "../data"))
         return 0;
 
     render_write(event_getdata(imessage), event_getdatasize(imessage));
@@ -337,12 +337,12 @@ static unsigned int oninit(union event_message *imessage, union event_message *o
     activateview(currentview);
     render_init();
 
-    if (!file_walk(FILE_L0, FILE_G3, "../ctrl"))
+    if (!file_walk(FILE_L0, FILE_G4, "../ctrl"))
         return 1;
 
     render_setvideo(FILE_L0, 1024, 768, 4);
 
-    if (!file_walk(FILE_L0, FILE_G3, "../colormap"))
+    if (!file_walk(FILE_L0, FILE_G4, "../colormap"))
         return 1;
 
     render_setcolormap(FILE_L0);
@@ -913,22 +913,26 @@ void main(void)
     union event_message imessage;
     union event_message omessage;
 
-    if (!file_walk2(FILE_G0, "/system/event"))
+    if (!file_walk2(FILE_G0, "/system/multicast"))
         return;
 
-    if (!file_walk2(FILE_G1, "/system/keyboard/event"))
+    if (!file_walk2(FILE_G1, "/system/event"))
         return;
 
-    if (!file_walk2(FILE_G2, "/system/mouse/event"))
+    if (!file_walk2(FILE_G2, "/system/keyboard/event"))
         return;
 
-    if (!file_walk2(FILE_G3, "/system/video/if:0/event"))
+    if (!file_walk2(FILE_G3, "/system/mouse/event"))
+        return;
+
+    if (!file_walk2(FILE_G4, "/system/video/if:0/event"))
         return;
 
     file_open(FILE_G0);
     file_open(FILE_G1);
     file_open(FILE_G2);
     file_open(FILE_G3);
+    file_open(FILE_G4);
 
     while (!status)
     {
@@ -1020,6 +1024,7 @@ void main(void)
 
     }
 
+    file_close(FILE_G4);
     file_close(FILE_G3);
     file_close(FILE_G2);
     file_close(FILE_G1);

src/wm/wres.c

@@ -53,9 +53,11 @@ void main(void)
     union event_message imessage;
     union event_message omessage;
 
-    if (!file_walk2(FILE_G0, "/system/event"))
+    if (!file_walk2(FILE_G0, "/system/multicast"))
         return;
 
+    file_open(FILE_G0);
+
     while (!status)
     {
 
@@ -81,5 +83,7 @@ void main(void)
 
     }
 
+    file_close(FILE_G0);
+
 }
 

src/wm/wshell.c

@@ -421,9 +421,11 @@ void main(void)
     union event_message imessage;
     union event_message omessage;
 
-    if (!file_walk2(FILE_G0, "/system/event"))
+    if (!file_walk2(FILE_G0, "/system/multicast"))
         return;
 
+    file_open(FILE_G0);
+
     while (!status)
     {
 
@@ -484,5 +486,7 @@ void main(void)
 
     }
 
+    file_close(FILE_G0);
+
 }