git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
AxWin - General cleaning
[tpg/acess2.git]
/
Usermode
/
Applications
/
axwin2_src
/
WM
/
messages.c
diff --git
a/Usermode/Applications/axwin2_src/WM/messages.c
b/Usermode/Applications/axwin2_src/WM/messages.c
index
61e3357
..
af7c819
100644
(file)
--- a/
Usermode/Applications/axwin2_src/WM/messages.c
+++ b/
Usermode/Applications/axwin2_src/WM/messages.c
@@
-5,8
+5,8
@@
#include "common.h"
#include <acess/sys.h>
#include <net.h>
#include "common.h"
#include <acess/sys.h>
#include <net.h>
-#include <axwin/messages.h>
-//#include <select.h>
+#include <axwin
2
/messages.h>
+//#include <s
ys/s
elect.h>
#define AXWIN_PORT 4101
#define AXWIN_PORT 4101
@@
-21,21
+21,25
@@
void Messages_RespondIPC(void *Ident, size_t Length, void *Data);
void Messages_Handle(void *Ident, int MsgLen, tAxWin_Message *Msg, tMessages_Handle_Callback *Respond);
// === GLOBALS ===
void Messages_Handle(void *Ident, int MsgLen, tAxWin_Message *Msg, tMessages_Handle_Callback *Respond);
// === GLOBALS ===
- int giIPCFileHandle;
+ int giNetworkFileHandle = -1;
+ int giMessagesFileHandle = -1;
// === CODE ===
void IPC_Init(void)
{
int tmp;
// TODO: Check this
// === CODE ===
void IPC_Init(void)
{
int tmp;
// TODO: Check this
- gi
IPC
FileHandle = open("/Devices/ip/loop/udp", OPENFLAG_READ);
+ gi
Network
FileHandle = open("/Devices/ip/loop/udp", OPENFLAG_READ);
tmp = AXWIN_PORT; ioctl(giIPCFileHandle, 4, &tmp); // TODO: Don't hard-code IOCtl number
tmp = AXWIN_PORT; ioctl(giIPCFileHandle, 4, &tmp); // TODO: Don't hard-code IOCtl number
+
+ // TODO: Open a handle to something like /Devices/proc/cur/messages to watch for messages
+// giMessagesFileHandle = open("/Devices/"
}
void IPC_FillSelect(int *nfds, fd_set *set)
{
}
void IPC_FillSelect(int *nfds, fd_set *set)
{
- if( gi
IPCFileHandle > *nfds ) *nfds = giIPC
FileHandle;
- FD_SET(gi
IPC
FileHandle, set);
+ if( gi
NetworkFileHandle > *nfds ) *nfds = giNetwork
FileHandle;
+ FD_SET(gi
Network
FileHandle, set);
}
void IPC_HandleSelect(fd_set *set)
}
void IPC_HandleSelect(fd_set *set)
@@
-45,6
+49,7
@@
void IPC_HandleSelect(fd_set *set)
char staticBuf[STATICBUF_SIZE];
int readlen, identlen;
char *msg;
char staticBuf[STATICBUF_SIZE];
int readlen, identlen;
char *msg;
+
readlen = read(giIPCFileHandle, sizeof(staticBuf), staticBuf);
// Assume that all connections are from localhost
readlen = read(giIPCFileHandle, sizeof(staticBuf), staticBuf);
// Assume that all connections are from localhost
@@
-105,7
+110,7
@@
void Messages_Handle(void *Ident, int MsgLen, tAxWin_Message *Msg, tMessages_Han
Msg->Data[0] = 0;
Msg->Data[1] = 1;
*(uint16_t*)&Msg->Data[2] = -1;
Msg->Data[0] = 0;
Msg->Data[1] = 1;
*(uint16_t*)&Msg->Data[2] = -1;
-
Messages_RespondIPC(ID
, sizeof(Msg->ID), Msg);
+
Respond(Ident
, sizeof(Msg->ID), Msg);
break;
#endif
default:
break;
#endif
default:
UCC
git Repository :: git.ucc.asn.au