diff VMS.h @ 234:0ee1a3c8972d

Merged Nina's fix of assembly with Sean's comments and cleanup
author Some Random Person <seanhalle@yahoo.com>
date Fri, 16 Mar 2012 10:43:15 -0700
parents a0ac58d8201c 125f0f90a0d3
children ecbf6992dab4
line diff
     1.1 --- a/VMS.h	Fri Mar 16 09:39:53 2012 -0700
     1.2 +++ b/VMS.h	Fri Mar 16 10:43:15 2012 -0700
     1.3 @@ -43,6 +43,9 @@
     1.4  typedef void     (*TopLevelFnPtr)  ( void *, SlaveVP * ); //initData, animSlv
     1.5  typedef void       TopLevelFn      ( void *, SlaveVP * ); //initData, animSlv
     1.6  typedef void     (*ResumeSlvFnPtr) ( SlaveVP *, void * );
     1.7 +      //=========== MEASUREMENT STUFF ==========
     1.8 +        MEAS__Insert_Counter_Handler
     1.9 +      //========================================
    1.10  
    1.11  //============================ HW Dependent Fns ================================
    1.12  
    1.13 @@ -105,6 +108,12 @@
    1.14   };
    1.15  //SchedSlot
    1.16  
    1.17 + enum VPtype {
    1.18 +     Slave = 1, //default
    1.19 +     Master,
    1.20 +     Shutdown
    1.21 + };
    1.22 + 
    1.23  /*This structure embodies the state of a slaveVP.  It is reused for masterVP
    1.24   * and shutdownVPs.
    1.25   */
    1.26 @@ -133,7 +142,10 @@
    1.27         MEAS__Insert_Meas_Fields_into_Slave;
    1.28        //========================================
    1.29     
    1.30 -   float64      createPtInSecs;  //have space but don't use on some configs
    1.31 +   enum VPtype type;
    1.32 +   int         numTimesAssigned;
    1.33 +       
    1.34 +   float64     createPtInSecs;  //have space but don't use on some configs
    1.35   };
    1.36  //SlaveVP
    1.37  
    1.38 @@ -181,6 +193,7 @@
    1.39         MEAS__Insert_Malloc_Meas_Fields_into_MasterEnv;
    1.40         MEAS__Insert_Plugin_Meas_Fields_into_MasterEnv;
    1.41         MEAS__Insert_System_Meas_Fields_into_MasterEnv;
    1.42 +       MEAS__Insert_Counter_Meas_Fields_into_MasterEnv;
    1.43        //==========================================
    1.44   }
    1.45  MasterEnv;
    1.46 @@ -246,6 +259,9 @@
    1.47  void
    1.48  VMS_SS__start_the_work_then_wait_until_done();
    1.49  
    1.50 +SlaveVP* 
    1.51 +VMS_SS__create_shutdown_slave();
    1.52 +
    1.53  void
    1.54  VMS_SS__shutdown();
    1.55