nanogui: compile nano-x cvs for ecos in NONETWORK mode
Subject:
compile nano-x cvs for ecos in NONETWORK mode
From:
"Lecordier, Guy" ####@####.####
Date:
28 Oct 2008 12:40:07 -0000
Message-Id: <427FC27C2ABCC042A7FB4E17D3F893B7FB0D79@lauescmx01.ROPERIND.NET>
Hello all,
The current implementation of eCos in nano-X does not support the
NONETWORK mode; it works only in client server mode.
The following proposed modifications will allow the NONETWORK mode
(LINK_APP_INTO_SERVER = Y)
Modifications done in srvmain.c & srvfunc.c & srvutil.c & srvevent.c
#ifdef NONETWORK // If LINK_APP_INTO_SERVER = Y don't remap
the server functions
#define _NO_SVR_MAPPING
#endif
These 3 lines are added before #include serv.h
They disable the mapping table of serv.h
Then to avoid the multiple definition of regfdmax regfdset ErrorFunc,
the eCos thread data defines located in nano-X.h must be disabled.
This done by adding these lines in nano-X.h
#ifndef NONETWORK // If LINK_APP_INTO_SERVER = N (NETWORKED
mode) to use the thread data
---
#endif // NONETWORK
Index: src/nanox/srvfunc.c
===================================================================
RCS file: /usr/cvs/microwin/src/nanox/srvfunc.c,v
retrieving revision 1.47
diff -u -r1.47 srvfunc.c
--- src/nanox/srvfunc.c 7 Jan 2008 00:01:31 -0000 1.47
+++ src/nanox/srvfunc.c 28 Oct 2008 12:09:49 -0000
@@ -8,6 +8,9 @@
#include <stdlib.h>
#include <string.h>
#define MWINCLUDECOLORS
+#ifdef NONETWORK // If LINK_APP_INTO_SERVER = Y don't remap
the server functions
+#define _NO_SVR_MAPPING
+#endif
#include "serv.h"
static int nextid = GR_ROOT_WINDOW_ID + 1;
Index: src/nanox/srvevent.c
===================================================================
RCS file: /usr/cvs/microwin/src/nanox/srvevent.c,v
retrieving revision 1.18
diff -u -r1.18 srvevent.c
--- src/nanox/srvevent.c 24 Jun 2005 00:26:57 -0000 1.18
+++ src/nanox/srvevent.c 28 Oct 2008 12:09:48 -0000
@@ -7,6 +7,9 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#ifdef NONETWORK // If LINK_APP_INTO_SERVER = Y don't remap
the server functions
+#define _NO_SVR_MAPPING
+#endif
#include "serv.h"
#if HAVE_VNCSERVER && VNCSERVER_PTHREADED
Index: src/nanox/srvmain.c
===================================================================
RCS file: /usr/cvs/microwin/src/nanox/srvmain.c,v
retrieving revision 1.27
diff -u -r1.27 srvmain.c
--- src/nanox/srvmain.c 24 Jun 2005 00:26:57 -0000 1.27
+++ src/nanox/srvmain.c 28 Oct 2008 12:09:49 -0000
@@ -22,6 +22,9 @@
#endif
#define MWINCLUDECOLORS
+#ifdef NONETWORK // If LINK_APP_INTO_SERVER = Y don't remap
the server functions
+#define _NO_SVR_MAPPING
+#endif
#include "serv.h"
#if UNIX | DOS_DJGPP
#include <unistd.h>
Index: src/nanox/srvutil.c
===================================================================
RCS file: /usr/cvs/microwin/src/nanox/srvutil.c,v
retrieving revision 1.18
diff -u -r1.18 srvutil.c
--- src/nanox/srvutil.c 7 Jan 2008 00:01:31 -0000 1.18
+++ src/nanox/srvutil.c 28 Oct 2008 12:09:49 -0000
@@ -12,6 +12,9 @@
#include <fcntl.h>
#endif
+#ifdef NONETWORK // If LINK_APP_INTO_SERVER = Y don't remap
the server functions
+#define _NO_SVR_MAPPING
+#endif
#include "serv.h"
/*
Any comments?
Regards,
Guy
