Commit 243d7602 authored by julien.delange's avatar julien.delange
Browse files

fix 1553 initialization



git-svn-id: https://tecsw.estec.esa.int/svn/taste/trunk/po-hi-c@639 129961e7-ef38-4bb5-a8f7-c9a525a55882
parent 373703de
...@@ -85,7 +85,9 @@ void __po_hi_msg_append_msg (__po_hi_msg_t* dest, __po_hi_msg_t* source); ...@@ -85,7 +85,9 @@ void __po_hi_msg_append_msg (__po_hi_msg_t* dest, __po_hi_msg_t* source);
* the source of the data. * the source of the data.
*/ */
void __po_hi_msg_get_data (void* dest, __po_hi_msg_t* source, __po_hi_uint32_t index, __po_hi_uint32_t size); void __po_hi_msg_get_data (void* dest, __po_hi_msg_t* source,
__po_hi_uint32_t index,
__po_hi_uint32_t size);
/* /*
* Get data from a message at index 'index', and copy it to the dest * Get data from a message at index 'index', and copy it to the dest
* argument It will copy size bytes from the messages. * argument It will copy size bytes from the messages.
......
...@@ -53,8 +53,6 @@ void __po_hi_c_driver_1553_rasta_poller (void) ...@@ -53,8 +53,6 @@ void __po_hi_c_driver_1553_rasta_poller (void)
__DEBUGMSG ("[RASTA 1553] Hello, i'm the poller !\n"); __DEBUGMSG ("[RASTA 1553] Hello, i'm the poller !\n");
__po_hi_c_driver_1553_rasta_brmlib_set_mode (po_hi_c_driver_1553_rasta_fd,BRM_MODE_RT);
__po_hi_c_driver_1553_rasta_brmlib_set_block(po_hi_c_driver_1553_rasta_fd,1,0); __po_hi_c_driver_1553_rasta_brmlib_set_block(po_hi_c_driver_1553_rasta_fd,1,0);
ret = __po_hi_c_driver_1553_rasta_brmlib_rt_recv (po_hi_c_driver_1553_rasta_fd,msgs); ret = __po_hi_c_driver_1553_rasta_brmlib_rt_recv (po_hi_c_driver_1553_rasta_fd,msgs);
...@@ -118,9 +116,6 @@ int __po_hi_c_driver_1553_rasta_sender (const __po_hi_task_id task_id, const __p ...@@ -118,9 +116,6 @@ int __po_hi_c_driver_1553_rasta_sender (const __po_hi_task_id task_id, const __p
msgs[0].desc = 32; msgs[0].desc = 32;
__po_hi_c_driver_1553_rasta_brmlib_set_mode (po_hi_c_driver_1553_rasta_fd, BRM_MODE_RT);
__po_hi_c_driver_1553_rasta_brmlib_set_block (po_hi_c_driver_1553_rasta_fd, 1, 0); __po_hi_c_driver_1553_rasta_brmlib_set_block (po_hi_c_driver_1553_rasta_fd, 1, 0);
if ( __po_hi_c_driver_1553_rasta_brmlib_rt_send (po_hi_c_driver_1553_rasta_fd, msgs) != 1 ) if ( __po_hi_c_driver_1553_rasta_brmlib_rt_send (po_hi_c_driver_1553_rasta_fd, msgs) != 1 )
...@@ -192,9 +187,6 @@ void __po_hi_c_driver_1553_rasta_controller () ...@@ -192,9 +187,6 @@ void __po_hi_c_driver_1553_rasta_controller ()
* ¤ BC mode * ¤ BC mode
*/ */
/* Set BC mode */
__DEBUGMSG("[RASTA 1553] Task1: Setting BC mode\n");
__po_hi_c_driver_1553_rasta_brmlib_set_mode (po_hi_c_driver_1553_rasta_fd,BRM_MODE_BC);
/* total blocking mode */ /* total blocking mode */
__DEBUGMSG("[RASTA 1553] Task1: Setting TX/RX blocking mode\n"); __DEBUGMSG("[RASTA 1553] Task1: Setting TX/RX blocking mode\n");
...@@ -233,7 +225,8 @@ void __po_hi_c_driver_1553_rasta_controller () ...@@ -233,7 +225,8 @@ void __po_hi_c_driver_1553_rasta_controller ()
result_list[j-1].wc = 8; result_list[j-1].wc = 8;
result_list[j-1].ctrl = BC_BUSA | BC_TR; /* RT transmit on bus a */ result_list[j-1].ctrl = BC_BUSA | BC_TR; /* RT transmit on bus a */
/* clear data */ /* clear data */
for (k = 0; k < 9; k++){ for (k = 0; k < 9; k++)
{
result_list[j-1].data[k] = 0; result_list[j-1].data[k] = 0;
} }
} }
...@@ -241,9 +234,9 @@ void __po_hi_c_driver_1553_rasta_controller () ...@@ -241,9 +234,9 @@ void __po_hi_c_driver_1553_rasta_controller ()
result_list[__PO_HI_NEED_DRIVER_1553_RASTA_MSG_CNT-1].wc++; result_list[__PO_HI_NEED_DRIVER_1553_RASTA_MSG_CNT-1].wc++;
result_list[__PO_HI_NEED_DRIVER_1553_RASTA_MSG_CNT].ctrl |= BC_EOL; /* end of list */ result_list[__PO_HI_NEED_DRIVER_1553_RASTA_MSG_CNT].ctrl |= BC_EOL; /* end of list */
__DEBUGMSG("[RASTA 1553] ------------- BC: START LIST EXECUTION -------------\n"); // __DEBUGMSG("[RASTA 1553] ------------- BC: START LIST EXECUTION -------------\n");
__DEBUGMSG("[RASTA 1553] Start CMD list processing.\n"); // __DEBUGMSG("[RASTA 1553] Start CMD list processing.\n");
if ( __po_hi_c_driver_1553_rasta_proccess_list(po_hi_c_driver_1553_rasta_fd,cmd_list,0) ) if ( __po_hi_c_driver_1553_rasta_proccess_list(po_hi_c_driver_1553_rasta_fd,cmd_list,0) )
{ {
return; return;
...@@ -271,9 +264,9 @@ void __po_hi_c_driver_1553_rasta_controller () ...@@ -271,9 +264,9 @@ void __po_hi_c_driver_1553_rasta_controller ()
j=1; j=1;
while( !(result_list[j-1].ctrl & BC_EOL) ) while( !(result_list[j-1].ctrl & BC_EOL) )
{ {
__DEBUGMSG("[RASTA 1553] Response to message %d: (len: %d, tsw1: %x, tsw2: %x)\n ",j,result_list[j-1].wc,result_list[j-1].tsw[0],result_list[j-1].tsw[1]); // __DEBUGMSG("[RASTA 1553] Response to message %d: (len: %d, tsw1: %x, tsw2: %x)\n ",j,result_list[j-1].wc,result_list[j-1].tsw[0],result_list[j-1].tsw[1]);
/* print data */ /* print data */
for (k = 0; k < result_list[j-1].wc; k++) /* for (k = 0; k < result_list[j-1].wc; k++)
{ {
if ( isalnum(result_list[j-1].data[k]) ) if ( isalnum(result_list[j-1].data[k]) )
{ {
...@@ -285,15 +278,40 @@ void __po_hi_c_driver_1553_rasta_controller () ...@@ -285,15 +278,40 @@ void __po_hi_c_driver_1553_rasta_controller ()
} }
} }
__DEBUGMSG("\n"); __DEBUGMSG("\n");
*/
j++; j++;
} }
__DEBUGMSG("[RASTA 1553] -----------------------------------------------------\n");
} }
void __po_hi_c_driver_1553_rasta_init (__po_hi_device_id id) void __po_hi_c_driver_1553_rasta_init_terminal (__po_hi_device_id id)
{
__DEBUGMSG ("[RASTA 1553] Init\n");
init_pci();
__DEBUGMSG ("[RASTA 1553] Initializing RASTA (rasta_register()) ...\n");
if (rasta_register())
{
__DEBUGMSG(" ERROR !\n");
return;
}
__DEBUGMSG(" OK !\n");
po_hi_c_driver_1553_rasta_fd = __po_hi_c_driver_1553_rasta_brmlib_open (__PO_HI_DRIVER_RASTA_1553_DEVICE);
if (po_hi_c_driver_1553_rasta_fd < 0)
{
__DEBUGMSG ("[RASTA 1553] Unable to open 1553 device\n");
return;
}
__po_hi_c_driver_1553_rasta_brmlib_set_mode (po_hi_c_driver_1553_rasta_fd,BRM_MODE_RT);
}
void __po_hi_c_driver_1553_rasta_init_controller (__po_hi_device_id id)
{ {
__DEBUGMSG ("[RASTA 1553] Init\n"); __DEBUGMSG ("[RASTA 1553] Init\n");
init_pci(); init_pci();
...@@ -314,9 +332,13 @@ void __po_hi_c_driver_1553_rasta_init (__po_hi_device_id id) ...@@ -314,9 +332,13 @@ void __po_hi_c_driver_1553_rasta_init (__po_hi_device_id id)
return; return;
} }
/* Set BC mode */
__DEBUGMSG("[RASTA 1553] Task1: Setting BC mode\n");
__po_hi_c_driver_1553_rasta_brmlib_set_mode (po_hi_c_driver_1553_rasta_fd,BRM_MODE_BC);
} }
#endif #endif
......
Supports Markdown
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