Commit 8ac4e219 authored by julien.delange's avatar julien.delange
Browse files

previous examples now work fine

fix destination node for spacewire
spacewire fully works now



git-svn-id: https://tecsw.estec.esa.int/svn/taste/trunk/po-hi-c@594 129961e7-ef38-4bb5-a8f7-c9a525a55882
parent 820d55e0
......@@ -15,7 +15,7 @@
void __po_hi_driver_sockets_receiver (void);
void __po_hi_driver_sockets_init (void);
void __po_hi_driver_sockets_init (__po_hi_device_id id);
#include <po_hi_transport.h>
/* Files from PolyORB-HI-C */
......
......@@ -50,8 +50,10 @@ __po_hi_local_port_t __po_hi_get_local_port_from_global_port (const __po_hi_port
__po_hi_uint8_t __po_hi_get_endianness (const __po_hi_node_t node);
#if __PO_HI_NB_DEVICES > 0
__po_hi_device_id __po_hi_get_device_from_port (const __po_hi_port_t port);
char* __po_hi_get_naming (const __po_hi_port_t port);
char* __po_hi_get_device_naming (const __po_hi_port_t port);
#endif
#endif /* __PO_HI_TRANSPORT__ */
......@@ -44,7 +44,7 @@ int po_hi_c_driver_rasta_spacewire_fd;
void po_hi_c_driver_rasta_spacewire_init_pkt(__po_hi_c_driver_spacewire_pkt_hdr_t *p, __po_hi_port_t destination_port)
{
p->addr = atoi (__po_hi_get_naming (destination_port));
p->addr = atoi (__po_hi_get_device_naming (destination_port));
p->protid = 50;
p->dummy = 0x01;
p->channel = 0x01;
......@@ -96,7 +96,7 @@ void __po_hi_c_driver_spacewire_rasta_init (__po_hi_device_id id)
{
unsigned int node_addr;
node_addr = atoi (__po_hi_get_naming (id));
node_addr = atoi (__po_hi_get_device_naming (id));
__DEBUGMSG ("[RASTA SPACEWIRE] Init\n");
......
......@@ -146,7 +146,8 @@ __po_hi_uint8_t __po_hi_get_endianness (const __po_hi_node_t node)
return __po_hi_deployment_endiannesses[node];
}
char* __po_hi_get_naming (const __po_hi_port_t port)
#if __PO_HI_NB_DEVICES > 0
char* __po_hi_get_device_naming (const __po_hi_port_t port)
{
return __po_hi_devices_naming[port];
}
......@@ -155,3 +156,6 @@ __po_hi_device_id __po_hi_get_device_from_port (const __po_hi_port_t port)
{
return __po_hi_port_to_device[port];
}
#endif
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