summaryrefslogtreecommitdiff
path: root/cesar/interface/fcall
diff options
context:
space:
mode:
authorschodet2008-09-15 14:05:23 +0000
committerschodet2008-09-15 14:05:23 +0000
commit506b61ced0f5a925adafbfd77a7ff2bcd7603ec3 (patch)
tree75e56d680482efaa413e9e61b813866b4581125a /cesar/interface/fcall
parent1bd2579220386207345397b8ce21c950b790d065 (diff)
* host, interface:
- cleaned-up host/interface/fcall compilation. git-svn-id: svn+ssh://pessac/svn/cesar/trunk@2969 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cesar/interface/fcall')
-rw-r--r--cesar/interface/fcall/Config0
-rw-r--r--cesar/interface/fcall/Module3
-rw-r--r--cesar/interface/fcall/src/interface_fcall.c4
-rw-r--r--cesar/interface/fcall/test/Config3
-rw-r--r--cesar/interface/fcall/test/Makefile5
5 files changed, 4 insertions, 11 deletions
diff --git a/cesar/interface/fcall/Config b/cesar/interface/fcall/Config
deleted file mode 100644
index e69de29bb2..0000000000
--- a/cesar/interface/fcall/Config
+++ /dev/null
diff --git a/cesar/interface/fcall/Module b/cesar/interface/fcall/Module
index d250d6dbca..b4eb151c33 100644
--- a/cesar/interface/fcall/Module
+++ b/cesar/interface/fcall/Module
@@ -1,4 +1 @@
SOURCES := interface_fcall.c
-ifeq ($(TARGET),sparc)
-MODULES := host/sci/cesar host/fcall
-endif
diff --git a/cesar/interface/fcall/src/interface_fcall.c b/cesar/interface/fcall/src/interface_fcall.c
index 25cca2063d..18497a07e8 100644
--- a/cesar/interface/fcall/src/interface_fcall.c
+++ b/cesar/interface/fcall/src/interface_fcall.c
@@ -50,9 +50,7 @@ interface_fcall_init (interface_fcall_send_message_cb_t send_cb,
static fcall_ctx_t fcall_ctx;
static probe_ctx_t probe_ctx;
-#ifdef FCALL_PROTO
static sci_ctx_t sci_ctx;
-#endif /* FCALL_PROTO */
dbg_assert_ptr(send_cb);
dbg_assert_ptr(send_done_cb);
@@ -75,7 +73,6 @@ interface_fcall_init (interface_fcall_send_message_cb_t send_cb,
ctx.buffer_get_cb = buffer_get_cb;
ctx.user_data = user_data;
-#ifdef FCALL_PROTO
if (sci_init(&sci_ctx, NULL) < 0)
{
dbg_assert_print(false, "sci init failed with errno = %d", errno);
@@ -96,7 +93,6 @@ interface_fcall_init (interface_fcall_send_message_cb_t send_cb,
dbg_assert_print(false, "probe init failed with errno = %d", errno);
return NULL;
}
-#endif /* FCALL_PROTO */
return &ctx;
}
diff --git a/cesar/interface/fcall/test/Config b/cesar/interface/fcall/test/Config
index 20950daa9a..774a09dced 100644
--- a/cesar/interface/fcall/test/Config
+++ b/cesar/interface/fcall/test/Config
@@ -1,2 +1,3 @@
CONFIG_DEBUG = y
-CONFIG_DEBUG_FATAL_CATCH = y \ No newline at end of file
+CONFIG_DEBUG_FATAL_CATCH = y
+CONFIG_FCALL_MME = y
diff --git a/cesar/interface/fcall/test/Makefile b/cesar/interface/fcall/test/Makefile
index 1ff18378a0..bc4b3281a3 100644
--- a/cesar/interface/fcall/test/Makefile
+++ b/cesar/interface/fcall/test/Makefile
@@ -1,8 +1,7 @@
BASE = ../../..
-EXTRA_HOST_CFLAGS+= -DUNIT_TEST
-EXTRA_HOST_CFLAGS+= -DFCALL_PROTO
+DEFS += -DUNIT_TEST
HOST_PROGRAMS = test_interface_fcall
test_interface_fcall_SOURCES = test_interface_fcall.c
-test_interface_fcall_MODULES = lib interface/fcall host/sci/cesar host/fcall
+test_interface_fcall_MODULES = lib interface/fcall host
include $(BASE)/common/make/top.mk