michael found an error in the definition of the posix sporadic servers so i replaced...

[frescor/fna.git] / src_frescan / frescan.c

diff --git a/src_frescan/frescan.c b/src_frescan/frescan.c
index 114e059e38c47d09c6ca650b801aa109624cd86a..fcfcf973c79d08e3b82cb7a8b8a2032266eaec6b 100644 (file)
--- a/src_frescan/frescan.c
+++ b/src_frescan/frescan.c
@@ -34,8 +34,7 @@
 #include "frescan_debug.h"     // DEBUG
 #include "frescan_id.h"        // frescan_id_set_field, frescan_id_get_field
 #include "frescan_hw_buffer.h" // frescan_hw_buffer_update
-#include "frescan_reply_objects.h"     // frescan_replyobjects_init
-#include "frescan_servers_replenishments.h" // frescan_replenishments_xxx
+#include "frescan_bwres_robjs.h"     // frescan_replyobjects_init
 #include "frescan_packets.h"
 
 static int frescan_hook_frame_recv (const struct can_chip_t *chip,
@@ -151,18 +150,6 @@ int frescan_init(frescan_init_params_t *params)
                 return -1;
         }
 
-        ret = frescan_replenishments_init(params->net);
-        if (ret != 0) {
-                ERROR("could not initialize the replenishments\n");
-                return -1;
-        }
-
-        ret = frescan_replyobjects_init(FRESCAN_REPLY_OBJECTS_MX_CEILING);
-        if (ret != 0) {
-                ERROR("could not initialize the reply objects\n");
-                return -1;
-        }
-
         return 0;
 }
 
@@ -338,10 +325,7 @@ int frescan_recv(const frescan_recv_params_t *params,
         pqueue = the_networks[params->net].queues.rx_channel_queues
                                                              [params->channel];
 
-        FRESCAN_ACQUIRE_LOCK(&the_networks[params->net].lock);
         ret = frescan_pqueue_dequeue(pqueue, &head, prio, blocking);
-        FRESCAN_RELEASE_LOCK(&the_networks[params->net].lock);
-
         if (ret != 0) {
                 ERROR ("could not dequeue packet\n");
                 return -1;
@@ -541,13 +525,7 @@ static int frescan_hook_frame_sent(const struct can_chip_t *chip)
                 DEBUG(FRESCAN_SENT_HOOK_ENABLE_DEBUG,
                       "calling frame_sent + program repl for id:%u\n", id);
 
-                ret = frescan_replenishment_program(chip->minor, id);
-                if (ret != 0) {
-                        ERROR("could not program replenishment\n");
-                        return -1;
-                }
-
-                ret = frescan_servers_frame_sent(chip->minor, id);
+                ret = frescan_servers_frame_sent(chip->minor, id, packet);
                 if (ret != 0) {
                         ERROR("could not let the server a frame was sent\n");
                         return -1;