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
Merge branch 'master' of git://localhost/acess2
[tpg/acess2.git]
/
Usermode
/
Applications
/
axwin3_src
/
WM
/
ipc.c
diff --git
a/Usermode/Applications/axwin3_src/WM/ipc.c
b/Usermode/Applications/axwin3_src/WM/ipc.c
index
2917bc9
..
7874335
100644
(file)
--- a/
Usermode/Applications/axwin3_src/WM/ipc.c
+++ b/
Usermode/Applications/axwin3_src/WM/ipc.c
@@
-76,11
+76,11
@@
void IPC_Init(void)
{
int tmp;
// TODO: Check this
- giNetworkFileHandle =
o
pen("/Devices/ip/loop/udp", OPENFLAG_READ);
+ giNetworkFileHandle =
_SysO
pen("/Devices/ip/loop/udp", OPENFLAG_READ);
if( giNetworkFileHandle != -1 )
{
tmp = AXWIN_PORT;
-
ioctl(giNetworkFileHandle, 4, &tmp);
// TODO: Don't hard-code IOCtl number
+
_SysIOCtl(giNetworkFileHandle, 4, &tmp);
// TODO: Don't hard-code IOCtl number
}
}
@@
-103,7
+103,7
@@
void IPC_HandleSelect(fd_set *set)
int readlen, identlen;
char *msg;
- readlen =
r
ead(giNetworkFileHandle, staticBuf, sizeof(staticBuf));
+ readlen =
_SysR
ead(giNetworkFileHandle, staticBuf, sizeof(staticBuf));
identlen = 4 + Net_GetAddressSize( ((uint16_t*)staticBuf)[1] );
msg = staticBuf + identlen;
@@
-114,11
+114,11
@@
void IPC_HandleSelect(fd_set *set)
}
size_t len;
-
pid_t
tid;
- while( (len = SysGetMessage(&tid, 0, NULL)) )
+
int
tid;
+ while( (len =
_
SysGetMessage(&tid, 0, NULL)) )
{
char data[len];
- SysGetMessage(NULL, len, data);
+
_
SysGetMessage(NULL, len, data);
IPC_Handle(&gIPC_Type_SysMessage, &tid, len, (void*)data);
// _SysDebug("IPC_HandleSelect: Message handled");
@@
-145,7
+145,7
@@
void IPC_Type_Datagram_Send(const void *Ident, size_t Length, const void *Data)
memcpy(tmpbuf, Ident, identlen); // Header
memcpy(tmpbuf + identlen, Data, Length); // Data
// TODO: Handle fragmented packets
-
w
rite(giNetworkFileHandle, tmpbuf, sizeof(tmpbuf));
+
_SysW
rite(giNetworkFileHandle, tmpbuf, sizeof(tmpbuf));
}
int IPC_Type_Sys_GetSize(const void *Ident)
@@
-160,7
+160,7
@@
int IPC_Type_Sys_Compare(const void *Ident1, const void *Ident2)
void IPC_Type_Sys_Send(const void *Ident, size_t Length, const void *Data)
{
- SysSendMessage( *(const tid_t*)Ident, Length, Data );
+
_
SysSendMessage( *(const tid_t*)Ident, Length, Data );
}
// --- Client -> Window Mappings
@@
-461,8
+461,8
@@
int IPC_Msg_FocusWindow(tIPC_Client *Client, tAxWin_IPCMessage *Msg)
ASSERT(Msg->ID == IPCMSG_FOCUSWINDOW);
// Don't allow the focus to be changed unless the client has the focus
-
if(!gpWM_FocusedWindow) return 1;
-
if(gpWM_FocusedWindow->Client != Client) return 1;
+
//
if(!gpWM_FocusedWindow) return 1;
+
//
if(gpWM_FocusedWindow->Client != Client) return 1;
win = IPC_int_GetWindow(Client, Msg->Window);
if(!win) return 1;
UCC
git Repository :: git.ucc.asn.au