Commit ec0ede0f authored by Delia Cellarier's avatar Delia Cellarier
parents bba65b9b feb150a5
......@@ -319,7 +319,6 @@ void __po_hi_c_driver_eth_leon_poller (const __po_hi_device_id dev_id)
len = recv (rnodes[dev].socket,
&datareceived, sizeof (int),
MSG_WAITALL);
// datareceived = __po_hi_swap_byte (datareceived); /* XXXX */
__DEBUGMSG ("[DRIVER SOCKETS] Waiting for a message of size=%d\n",
(int)datareceived);
......@@ -628,9 +627,6 @@ int __po_hi_c_driver_eth_leon_sender (__po_hi_task_id task, __po_hi_port_t port
int optval = 0;
socklen_t optlen = 0;
unsigned long* swap_pointer;
unsigned long swap_value;
__po_hi_device_id associated_device;
__po_hi_local_port_t local_port;
__po_hi_request_t* request;
......@@ -724,7 +720,11 @@ int __po_hi_c_driver_eth_leon_sender (__po_hi_task_id task, __po_hi_port_t port
(request, &__po_hi_c_driver_eth_leon_sender_msg);
size_to_write = __po_hi_msg_length
<<<<<<< HEAD
(&__po_hi_c_driver_eth_leon_sender_msg);
=======
(&__po_hi_c_driver_eth_leon_sender_msg);
>>>>>>> feb150a54486a886b14651a99a7eb94ec580d30f
#ifdef __PO_HI_DEBUG
__po_hi_messages_debug (&__po_hi_c_driver_eth_leon_sender_msg);
......@@ -735,7 +735,6 @@ int __po_hi_c_driver_eth_leon_sender (__po_hi_task_id task, __po_hi_port_t port
actually used. */
int msg_size_network = size_to_write;
//__po_hi_swap_byte (size_to_write);
len = write (nodes[associated_device].socket,
&msg_size_network, sizeof (int));
......
......@@ -5,7 +5,7 @@
*
* For more informations, please visit http://taste.tuxfamily.org/wiki
*
* Copyright (C) 2010-2017 ESA & ISAE.
* Copyright (C) 2010-2018 ESA & ISAE.
*/
#include <po_hi_config.h>
......@@ -434,7 +434,6 @@ void __po_hi_gqueue_wait_for_incoming_event (__po_hi_task_id id,
*port = __po_hi_gqueues_global_history[id][__po_hi_gqueues_global_history_offset[id]];
#if defined (POSIX) || defined (RTEMS_POSIX) || defined (XENO_POSIX)
pthread_mutex_unlock (&__po_hi_gqueues_mutexes[id]);
#elif defined (XENO_NATIVE)
......
......@@ -5,7 +5,7 @@
*
* For more informations, please visit http://taste.tuxfamily.org/wiki
*
* Copyright (C) 2007-2009 Telecom ParisTech, 2010-2014 ESA & ISAE.
* Copyright (C) 2007-2009 Telecom ParisTech, 2010-2018 ESA & ISAE.
*/
#include <po_hi_config.h>
......@@ -65,7 +65,6 @@ void __po_hi_marshall_port (__po_hi_port_t value, __po_hi_msg_t* msg)
void __po_hi_unmarshall_port (__po_hi_port_t* value, __po_hi_msg_t* msg)
{
__po_hi_port_t tmpvalue;
__po_hi_msg_get_data (value, msg, 0, sizeof(__po_hi_port_t));
......@@ -82,7 +81,11 @@ void __po_hi_unmarshall_port (__po_hi_port_t* value, __po_hi_msg_t* msg)
void __po_hi_marshall_array (void* value, __po_hi_msg_t* msg,__po_hi_uint32_t size, __po_hi_uint32_t* offset)
{
<<<<<<< HEAD
=======
// XXX
>>>>>>> feb150a54486a886b14651a99a7eb94ec580d30f
__po_hi_msg_append_data (msg, value, size);
*offset = *offset + size;
}
......
......@@ -5,7 +5,7 @@
*
* For more informations, please visit http://taste.tuxfamily.org/wiki
*
* Copyright (C) 2007-2009 Telecom ParisTech, 2010-2017 ESA & ISAE.
* Copyright (C) 2007-2009 Telecom ParisTech, 2010-2018 ESA & ISAE.
*/
#include<stddef.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment