Skip to content

O
OpenXG-RAN
Commit 98e7558d authored by Florian Kaltenberger's avatar Florian Kaltenberger
Browse files
Options

timestamp should be int64_t

parent 2def2ee4
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 21 deletions
executables/nr-ru.c
View file @ 98e7558d
...@@ -300,7 +300,7 @@ int connect_rau(RU_t *ru) ...@@ -300,7 +300,7 @@ int connect_rau(RU_t *ru)
/* Southbound Fronthaul functions, RCC/RAU */ /* Southbound Fronthaul functions, RCC/RAU */
// southbound IF5 fronthaul for 16-bit OAI format // southbound IF5 fronthaul for 16-bit OAI format
static inline void fh_if5_south_out(RU_t *ru, int frame, int slot, uint64_t timestamp) static inline void fh_if5_south_out(RU_t *ru, int frame, int slot, int64_t timestamp)
{ {
if (ru == RC.ru[0]) VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_TRX_TST, ru->proc.timestamp_tx&0xffffffff ); if (ru == RC.ru[0]) VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_TRX_TST, ru->proc.timestamp_tx&0xffffffff );
...@@ -308,7 +308,7 @@ static inline void fh_if5_south_out(RU_t *ru, int frame, int slot, uint64_t time ...@@ -308,7 +308,7 @@ static inline void fh_if5_south_out(RU_t *ru, int frame, int slot, uint64_t time
} }
// southbound IF5 fronthaul for Mobipass packet format // southbound IF5 fronthaul for Mobipass packet format
static inline void fh_if5_mobipass_south_out(RU_t *ru, int frame, int slot, uint64_t timestamp) static inline void fh_if5_mobipass_south_out(RU_t *ru, int frame, int slot, int64_t timestamp)
{ {
if (ru == RC.ru[0]) VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_TRX_TST, ru->proc.timestamp_tx&0xffffffff ); if (ru == RC.ru[0]) VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_TRX_TST, ru->proc.timestamp_tx&0xffffffff );
...@@ -316,7 +316,7 @@ static inline void fh_if5_mobipass_south_out(RU_t *ru, int frame, int slot, uint ...@@ -316,7 +316,7 @@ static inline void fh_if5_mobipass_south_out(RU_t *ru, int frame, int slot, uint
} }
// southbound IF4p5 fronthaul // southbound IF4p5 fronthaul
static inline void fh_if4p5_south_out(RU_t *ru, int frame, int slot, uint64_t timestamp) static inline void fh_if4p5_south_out(RU_t *ru, int frame, int slot, int64_t timestamp)
{ {
if (ru == RC.ru[0]) VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_TRX_TST, ru->proc.timestamp_tx&0xffffffff ); if (ru == RC.ru[0]) VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_TRX_TST, ru->proc.timestamp_tx&0xffffffff );
...@@ -716,7 +716,7 @@ void rx_rf(RU_t *ru,int *frame,int *slot) { ...@@ -716,7 +716,7 @@ void rx_rf(RU_t *ru,int *frame,int *slot) {
} }
void tx_rf(RU_t *ru,int frame,int slot, uint64_t timestamp) { void tx_rf(RU_t *ru,int frame,int slot, int64_t timestamp) {
RU_proc_t *proc = &ru->proc; RU_proc_t *proc = &ru->proc;
NR_DL_FRAME_PARMS *fp = ru->nr_frame_parms; NR_DL_FRAME_PARMS *fp = ru->nr_frame_parms;
//nfapi_nr_config_request_t *cfg = &ru->gNB_list[0]->gNB_config; //nfapi_nr_config_request_t *cfg = &ru->gNB_list[0]->gNB_config;
......
openair1/PHY/defs_RU.h
View file @ 98e7558d
...@@ -508,7 +508,7 @@ typedef struct RU_t_s { ...@@ -508,7 +508,7 @@ typedef struct RU_t_s {
/// function pointer to synchronous RX fronthaul function (RRU,3GPP_eNB/3GPP_gNB) /// function pointer to synchronous RX fronthaul function (RRU,3GPP_eNB/3GPP_gNB)
void (*fh_south_in)(struct RU_t_s *ru, int *frame, int *subframe); void (*fh_south_in)(struct RU_t_s *ru, int *frame, int *subframe);
/// function pointer to synchronous TX fronthaul function /// function pointer to synchronous TX fronthaul function
void (*fh_south_out)(struct RU_t_s *ru, int frame_tx, int tti_tx, uint64_t timestamp_tx); void (*fh_south_out)(struct RU_t_s *ru, int frame_tx, int tti_tx, int64_t timestamp_tx);
/// function pointer to synchronous RX fronthaul function (RRU) /// function pointer to synchronous RX fronthaul function (RRU)
void (*fh_north_in)(struct RU_t_s *ru, int *frame, int *subframe); void (*fh_north_in)(struct RU_t_s *ru, int *frame, int *subframe);
/// function pointer to synchronous RX fronthaul function (RRU) /// function pointer to synchronous RX fronthaul function (RRU)
......
targets/RT/USER/gNB_usrp.gtkw
View file @ 98e7558d
[*] [*]
[*] GTKWave Analyzer v3.3.61 (w)1999-2014 BSI [*] GTKWave Analyzer v3.3.61 (w)1999-2014 BSI
[*] Tue Dec 17 15:31:51 2019 [*] Wed Dec 18 15:51:03 2019
[*] [*]
[dumpfile] "/tmp/gNB.vcd" [dumpfile] "/tmp/gnb.vcd"
[dumpfile_mtime] "Tue Dec 17 15:25:49 2019" [dumpfile_mtime] "Wed Dec 18 15:47:52 2019"
[dumpfile_size] 6343431 [dumpfile_size] 135231061
[savefile] "/home/wangts/openairinterface5g/targets/RT/USER/gNB_usrp.gtkw" [savefile] "/home/kaltenbe/openairinterface5g_ue/targets/RT/USER/gNB_usrp.gtkw"
[timestart] 1517712000 [timestart] 85978147000
[size] 1920 1018 [size] 1853 904
[pos] -9 -33 [pos] -1 -1
*-19.276148 1518358451 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 *-20.180098 85981340000 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1
[sst_width] 386 [sst_width] 386
[signals_width] 344 [signals_width] 344
[sst_expanded] 1 [sst_expanded] 1
...@@ -17,13 +17,8 @@ ...@@ -17,13 +17,8 @@
@28 @28
functions.trx_read functions.trx_read
functions.trx_write functions.trx_write
@420 @8420
variables.frame_number_TX0_UE[63:0] variables.trx_write_event[63:0]
variables.frame_number_TX1_UE[63:0]
@28
functions.ue_gain_control
@420
variables.frame_number_RX1_UE[63:0]
@24 @24
variables.trx_ts_ue[63:0] variables.trx_ts_ue[63:0]
variables.trx_ts[63:0] variables.trx_ts[63:0]
......
Markdown is supported
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