use conf values

git-svn-id: http://www.frescor.org/private/svn/frescor/fna/trunk@1468 35b4ef3e-fd22-0410-ab77-dab3279adceb

diff --git a/src_frescan/frescan_bwres_fna.c b/src_frescan/frescan_bwres_fna.c
index ff62a4f97c4d2641e0736db7b06d822ad5fab0c1..7c7e3a73f387152d6bc1b2810991324d7809a698 100644 (file)
--- a/src_frescan/frescan_bwres_fna.c
+++ b/src_frescan/frescan_bwres_fna.c
@@ -69,6 +69,7 @@
 #include "frescan.h" /* frescan_init, ... */
 #include "frescan_bwres.h" /* frescan_bwres_init, ... */
 #include "frescan_types.h"
+#include "frescan_config.h"
 #include "fna.h" /* fna_vres_id_t, fna_endpoint_data_t */
 #include "frescan_debug.h" /* DEBUG, FRESCAN_ERROR */
 #include "frescan_servers.h"
@@ -99,16 +100,14 @@ int frescan_fna_init(const frsh_resource_id_t resource_id)
         int ret;
         frescan_init_params_t init_params;
 
-        // TODO: resource_id must be relative or sth
-        // TODO: init_params must be configurable
-        init_params.net = 0; // (frescan_network_t)resource_id;
-        init_params.node = (frescan_node_t)FRSH_CPU_ID_DEFAULT;
-        init_params.tx_fp_max_prio = 10;
-        init_params.rx_num_of_channels = 10;
-        init_params.rx_channel_max_prio = NULL;
+        init_params.net = resource_id - FRESCAN_BWRES_FNA_NET_BASE;
+        init_params.node = FRESCAN_BWRES_FNA_LOCAL_NODE;
+        init_params.tx_fp_max_prio = FRESCAN_BWRES_TX_FP_MX_PRIO;
+        init_params.rx_num_of_channels = FRESCAN_BWRES_RX_NUM_CHANNELS;
+        init_params.rx_channel_max_prio = FRESCAN_BWRES_RX_CHAN_MX_PRIO;
 
         DEBUG(FRESCAN_BWRES_FNA_ENABLE_DEBUG,
-              "Initializing FRESCAN FNA node%u\n", FRSH_CPU_ID_DEFAULT);
+              "Initializing FRESCAN FNA node%u\n", init_params.node);
 
         ret = frescan_init(&init_params);
         if (ret != 0) FRESCAN_ERROR ("could not init FRESCAN");