commit before merge

2016-07-23 01:17:59 -07:00
parent 41f0423312
commit 6e4d361eb3
12 changed files with 388 additions and 636 deletions
@@ -707,6 +707,8 @@ typedef struct {
  // phy related params
  unsigned int n_frames;
  unsigned int n_frames_flag; // if set, then let the emulation goes to infinity
+  node_function_t node_function[MAX_NUM_CCs];
+  node_timing_t node_timing[MAX_NUM_CCS];
  unsigned char frame_type[MAX_NUM_CCs]; //! LTE frame type (TDD=1, FDD=0). \note this should be converted to \ref lte_frame_type_t (header file reorganization needed)
  char * frame_type_name[MAX_NUM_CCs];
  unsigned char tdd_config[MAX_NUM_CCs];