Diff: main.cpp

Revision:

74:81c47fff88a5

Parent:

72:895ca792c647

Child:

75:bd3c647b860b

--- a/main.cpp	Wed Nov 19 14:06:13 2014 +0000
+++ b/main.cpp	Mon Nov 24 16:43:16 2014 +0000
@@ -1,13 +1,18 @@
-#include "bits.h"
-#include "utils.h"
+#include "telemetry.h"                                                                                                                  
+#include "eth.h"                                                                                                                        
+#include "bits.h"                                                                                                                       
+#include "UART3Interrupt.h" // for RXBuffer[ __CB_BUFFER_SIZE__ ];                                                                                 
+#include "utils.h"                                                                                                                      
+#include "parallelcpld.h"                                                                                                               
+#include "debug.h"                                                                                                                      
+#include "flood.h"                                                                                                                      
+#include "bootloader_cbx.h"                                                                                                             
+#include "call_manager.h"                                                                                                               
+#include "call_box_manager.h"                                                                                                           
+#include "sip_manager.h"                                                                                                                
+#include "shared_variables.h"
+#include "prompt.h"
 #include "configs.h"
-#include "UART3Interrupt.h"
-#include "parallelcpld.h"
-#include "prompt.h"
-#include "debug.h"
-#include "utils.h"
-#include "flood.h"
-#include "bootloader_cbx_handler.h"
 
 volatile uint8_t status = 0x00;
 
@@ -245,12 +250,15 @@
         if( pflood == 1 ) flood();               
         
         if( status != __WAITING__ ){
-            xmemcpy( cb_rx_buffer, buffer_from_cb_ptr, __CB_BUFFER_SIZE__ );
-            __read_cb_buffer__( buffer, buffer_from_cb_ptr );     
+            xmemcpy( cb_rx_buffer, buffer_from_cb_ptr, __CB_BUFFER_SIZE__ );    
+            //__read_cb_buffer__( buffer, buffer_from_cb_ptr );
             status = __WAITING__;
+            __read_cb_buffer__( buffer, cb_rx_buffer );
         
             data = __parse_vz_pkg__( &ext, &port, &type, buffer );
             
+            debug_msg("-->%x<--", type );
+            
             if( data != NULL ){                
                 if( debug_alive == 1 && debug_cb_rx ) debug_msg("Pkg from CBx :: %d -- Type :: %d", ext, type );
                 if( type != __AUDIO__ ){
@@ -261,7 +269,7 @@
                             // some pkg reply
                             if( ( data[ 0 ] | BIT7 ) == cb->get_msg_id() ){                        
                                 if( type == __BOOT__ ) type = __REGISTRY__;
-                                __send_to_cb__( __build_cb_package__( ext, port, type, 
+                                send2callboxes( __build_cb_package__( ext, port, type, 
                                 ( char * )data, cb->get_msg_id(), __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) );
                                 type = __DO_NOTHING__;
                                 if( debug_main ) debug_msg("-- Renviado ultimo pkg --");
@@ -379,7 +387,7 @@
                             v_call->remove_element( i );    
                             set_status( cb->sip->status, sip_idle);
                             data[ __TIMESLICE_PLACE__ ] = 0x00;
-                            __send_to_cb__( __build_cb_package__( ext, port, __CB_BYE__,
+                            send2callboxes( __build_cb_package__( ext, port, __CB_BYE__,
                                 ( char * )data, cb->get_msg_id(), __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) );
                             set_status( cb->sip->status, sip_idle );
                             delete( call );
@@ -410,7 +418,7 @@
                     set_status(cb->status,cb_idle);
                     cb->set_timeslice( 0x00 );
                     data[ __TIMESLICE_PLACE__ ] = 0x00;
-                    __send_to_cb__( __build_cb_package__( ext, port, __INVITE__, 
+                    send2callboxes( __build_cb_package__( ext, port, __INVITE__, 
                         ( char * )data, cb->get_msg_id(), __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) );
                     if( debug_main ) debug_msg( "denying call - another call box on call" );    
                     break;
@@ -427,7 +435,7 @@
                     case cb_on_call : {
                         // a priori, nao fazer nada
                         //data[ __TIMESLICE_PLACE__ ] = 0x00;
-                        //__send_to_cb__( __build_cb_package__( ext, port, __BYE__, 
+                        //send2callboxes( __build_cb_package__( ext, port, __BYE__, 
                         //    ( char * )data, cb->get_msg_id(), __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) );
                     }break;
                     
@@ -443,14 +451,14 @@
                             //sem timeslice pra tratar com o *
                             set_status(cb->status,cb_idle);
                             data[ __TIMESLICE_PLACE__ ] = 0x00;
-                            __send_to_cb__( __build_cb_package__( ext, port, __INVITE__, 
+                            send2callboxes( __build_cb_package__( ext, port, __INVITE__, 
                                 ( char * )data, cb->get_msg_id(), __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) );
                             set_status( cb->sip->status, sip_idle );
                             if( debug_main ) debug_msg( "-- Trying -- without TS -- %s ", write_buffer );
                         }else{
                             set_status(cb->status,cb_busy);
                             data[ __TIMESLICE_PLACE__ ] = cb->get_timeslice();
-                            __send_to_cb__( __build_cb_package__( ext, port, __INVITE__, 
+                            send2callboxes( __build_cb_package__( ext, port, __INVITE__, 
                                 ( char * )data, cb->get_msg_id(), __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) );
                             
                             if( debug_main ) debug_msg(" -- %d on %d -- ", cb->get_ext(), data[ __TIMESLICE_PLACE__ ] );
@@ -464,7 +472,7 @@
                                 set_status(cb->status,cb_on_call);
                                 
                                 if( debug_main ) debug_msg(" -- %d on %d -- ", cb->get_ext(), data[ __TIMESLICE_PLACE__ ] );
-                                __send_to_cb__( __build_cb_package__( ext, port, __INVITE__, 
+                                send2callboxes( __build_cb_package__( ext, port, __INVITE__, 
                                     ( char * )data, cb->get_msg_id(), __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) );
                                 if( debug_main ) debug_msg( "-- Trying -- accepting call request --" );
                             }else{
@@ -473,7 +481,7 @@
                                 cb->set_timeslice( 0x00 );
                                 data[ __TIMESLICE_PLACE__ ] = 0x00;
                                 if( debug_main ) debug_msg(" -- %d on %d -- ", cb->get_ext(), data[ __TIMESLICE_PLACE__ ] );
-                                __send_to_cb__( __build_cb_package__( ext, port, __CB_BYE__, 
+                                send2callboxes( __build_cb_package__( ext, port, __CB_BYE__, 
                                     ( char * )data, cb->get_msg_id(), __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) );
                                 if( debug_main ) debug_msg( "-- Trying -- denying call request --" );
                                 set_status( cb->sip->status, sip_idle);
@@ -486,7 +494,7 @@
                         cb->set_timeslice( 0x00 );
                         data[ __TIMESLICE_PLACE__ ] = 0x00;
                         if( debug_main ) debug_msg(" -- %d on %d -- ", cb->get_ext(), data[ __TIMESLICE_PLACE__ ] );
-                        __send_to_cb__( __build_cb_package__( ext, port, __CB_BYE__, 
+                        send2callboxes( __build_cb_package__( ext, port, __CB_BYE__, 
                             ( char * )data, cb->get_msg_id(), __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) );
                         if( debug_main ) debug_msg( "-- Trying -- denying call request << Busy Here >> --" );
                         set_status( cb->sip->status, sip_idle );
@@ -513,7 +521,7 @@
                 }break;
             case __BOOT__ : {
                 boot_counter++;
-                __send_to_cb__( __build_cb_package__( ext, port, __REGISTRY__, 
+                send2callboxes( __build_cb_package__( ext, port, __REGISTRY__, 
                     ( char * )data, data[ 0 ], __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) );
                 }break;
             case __TELEMETRY__ : {
@@ -583,7 +591,7 @@
                 uint8_t * pkg2cb = __build_cb_package__( call->get_cb_ext(), cb_port, __AUDIO__, 
                     tmp, __AUDIO__, length, write_buffer );
                 
-                __send_to_cb__( pkg2cb );
+                send2callboxes( pkg2cb );
             }
         }
         if( v_call->size() == 0 ) registry_aging( v_cb, buffer, write_buffer );
@@ -605,7 +613,7 @@
                             delete( call );
                         }
                     }
-                    __send_to_cb__( __build_cb_package__( ext, port, __CB_BYE__, 
+                    send2callboxes( __build_cb_package__( ext, port, __CB_BYE__, 
                         ( char * )buffer, cb->get_msg_id(), __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) );
                     //FIXMEj talvez eu nao precise dessa linha mudar o set_status( cb->sip->status, sip_idle ); pra ver o que acontece
                     //cb->reset_sip();