Diff: call_box_manager.cpp

Revision:

106:a34fcf9f0e02

Parent:

105:a930035b6556

Child:

108:18a3702650f3

--- a/call_box_manager.cpp	Tue Mar 10 18:10:57 2015 +0000
+++ b/call_box_manager.cpp	Fri Mar 13 19:40:56 2015 +0000
@@ -13,48 +13,42 @@
     return( NULL );
 }
 
-int refresh( Vector * v_cb, uint8_t * data, uint8_t * write_buffer, Call_Box * cb ){
-    if( v_cb != NULL && data != NULL  && write_buffer != NULL ){
+int refresh ( Vector * v_cb )
+{
+    if( v_cb != NULL)
+    {
         static int lst_index = 0;
-        
-        if( cb != NULL ){
-            timer_refresh.reset();
-            
-            cb->set_msg_id( ( cb->get_msg_id() + 1 ) & ~BIT7 );
             
-            send2callboxes( build_cb_package( cb->get_ext(), cb->get_port(), __REGISTRY__, 
-                        ( char * )data, cb->get_msg_id(), CB_BUFFER_SIZE - __VZ_HEADER_OFFSET__, write_buffer ) );
-            
-            if( debug_refresh ) send_msg("Refresh specific %d", cb->get_ext() );
+        if( v_cb->size() > 0 )
+        {
+            uint8_t data[ CB_BUFFER_SIZE ], write_buffer[ CB_BUFFER_SIZE ];
             
-            return( 0x10 );
-        }else{
-            if( v_cb->size() > 0 ){
-                if( lst_index >= v_cb->size() ) lst_index = 0;
+            led4 = 0;
+            if( lst_index >= v_cb->size() ) lst_index = 0;
+            
+            Call_Box * cb = (Call_Box * )v_cb->get_element( lst_index++ );
+            
+            if( cb != NULL && cb->status == cb_idle ){
                 
-                Call_Box * cb = (Call_Box * )v_cb->get_element( lst_index++ );
+                if( cb->get_ext() % 2 == 1 ){ 
+                    Call_Box * cb_master =  __find_CB__( v_cb, cb->get_ext() - 1 );
+                    if( cb_master != NULL && cb_master->status != cb_idle ) return( 0x20 );
+                }
+        
+                cb->set_msg_id( ( cb->get_msg_id() + 1 ) & ~BIT7 );
+                        
+                send2callboxes( build_cb_package( cb->get_ext(), cb->get_port(), __REGISTRY__, 
+                    ( char * )data, cb->get_msg_id(), CB_BUFFER_SIZE - __VZ_HEADER_OFFSET__, write_buffer ) );
                 
-                if( cb != NULL && cb->status == cb_idle ){
-                    
-                    if( cb->get_ext() % 2 == 1 ){ 
-                        Call_Box * cb_master =  __find_CB__( v_cb, cb->get_ext() - 1 );
-                        if( cb_master != NULL && cb_master->status != cb_idle ) return( 0x20 );
-                    }
-            
-                    cb->set_msg_id( ( cb->get_msg_id() + 1 ) & ~BIT7 );
-                            
-                    send2callboxes( build_cb_package( cb->get_ext(), cb->get_port(), __REGISTRY__, 
-                        ( char * )data, cb->get_msg_id(), CB_BUFFER_SIZE - __VZ_HEADER_OFFSET__, write_buffer ) );
-                    
-                    if( debug_refresh ) send_msg("Refresh %d", cb->get_ext() );
-                    
-                    return( 0 );
-                }else return( -5 );
-            }else return( -3 );
-        }
+                if( debug_refresh ) send_msg("Refresh %d", cb->get_ext() );
+                
+                return( 0 );
+            }else return( -5 );
+        }else return( -3 );
     }else return( -1 );
 }
 
+
 //FiXME se validar, nao preciso de tantos parametros ...
 void registry_aging( Vector * v_cb, uint8_t * data, uint8_t * write_buffer ){
     for( register int i = 0; i < v_cb->size(); i++ ){
@@ -71,7 +65,9 @@
     }
 }
 
-void wake_all_up( Vector * v_cb, uint8_t * data, uint8_t * write_buffer ){
+//void wake_all_up( Vector * v_cb, uint8_t * data, uint8_t * write_buffer ){
+void wake_all_up( Vector * v_cb )
+{
  /***
     [ Principio ]
         -- Procurar por CBx que constem sem seus pares registrados na lógica.
@@ -88,7 +84,8 @@
                         - Caso nao esteja, encaminha mensagem de ping para o CBx ausente da dupla.
  ***/
  
-    if( v_cb != NULL && data != NULL  && write_buffer != NULL ){
+    uint8_t data[ CB_BUFFER_SIZE ], write_buffer[ CB_BUFFER_SIZE ];
+    if( ( v_cb != NULL ) ){
         static int ext_list[ __MAX_CB_IN_A_BRANCH__ + 1 ];
         static uint8_t last_size = 0;
         uint8_t size = v_cb->size();