PentHertz
/
srsLTE
mirror of https://github.com/PentHertz/srsLTE.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added MIB decoding to pdsch_ue file mode. usrp_capture_sync captures entires frames

This commit is contained in:
ismagom 2015-04-08 11:42:31 +01:00
parent 7b86cd030d
commit 86625ecc95
2 changed files with 32 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
srslte/examples/pdsch_ue.c
View File

@ -302,18 +302,12 @@ int main(int argc, char **argv) {
INFO("Stopping UHD and flushing buffer...\r",0); INFO("Stopping UHD and flushing buffer...\r",0);
cuhd_stop_rx_stream(uhd); cuhd_stop_rx_stream(uhd);
cuhd_flush_buffer(uhd); cuhd_flush_buffer(uhd);
if (srslte_ue_mib_init(&ue_mib, cell)) {
fprintf(stderr, "Error initaiting UE MIB decoder\n");
exit(-1);
}
} }
#endif #endif
/* If reading from file, go straight to PDSCH decoding. Otherwise, decode MIB first */ /* If reading from file, go straight to PDSCH decoding. Otherwise, decode MIB first */
if (prog_args.input_file_name) { if (prog_args.input_file_name) {
state = DECODE_PDSCH;
/* preset cell configuration */ /* preset cell configuration */
cell.id = prog_args.file_cell_id; cell.id = prog_args.file_cell_id;
cell.cp = SRSLTE_CP_NORM; cell.cp = SRSLTE_CP_NORM;
@ -329,7 +323,6 @@ int main(int argc, char **argv) {
} else { } else {
#ifndef DISABLE_UHD #ifndef DISABLE_UHD
state = DECODE_MIB;
if (srslte_ue_sync_init(&ue_sync, cell, cuhd_recv_wrapper, uhd)) { if (srslte_ue_sync_init(&ue_sync, cell, cuhd_recv_wrapper, uhd)) {
fprintf(stderr, "Error initiating ue_sync\n"); fprintf(stderr, "Error initiating ue_sync\n");
exit(-1); exit(-1);
@ -337,6 +330,13 @@ int main(int argc, char **argv) {
#endif #endif
} }
state = DECODE_MIB;
if (srslte_ue_mib_init(&ue_mib, cell)) {
fprintf(stderr, "Error initaiting UE MIB decoder\n");
exit(-1);
}
if (srslte_ue_dl_init(&ue_dl, cell)) { // This is the User RNTI if (srslte_ue_dl_init(&ue_dl, cell)) { // This is the User RNTI
fprintf(stderr, "Error initiating UE downlink processing module\n"); fprintf(stderr, "Error initiating UE downlink processing module\n");
exit(-1); exit(-1);
@ -501,6 +501,8 @@ int main(int argc, char **argv) {
sf_cnt++; sf_cnt++;
} // Main loop } // Main loop
pthread_cancel(plot_thread);
pthread_join(plot_thread, NULL);
srslte_ue_dl_free(&ue_dl); srslte_ue_dl_free(&ue_dl);
srslte_ue_sync_free(&ue_sync); srslte_ue_sync_free(&ue_sync);

73
srslte/examples/usrp_capture_sync.c
View File

@ -42,7 +42,7 @@
static bool keep_running = true; static bool keep_running = true;
char *output_file_name = NULL; char *output_file_name = NULL;
char *uhd_args=""; char *uhd_args="";
float uhd_gain=40.0, uhd_freq=-1.0; float uhd_gain=60.0, uhd_freq=-1.0;
int nof_prb = 6; int nof_prb = 6;
int nof_subframes = -1; int nof_subframes = -1;
int N_id_2 = -1; int N_id_2 = -1;
@ -57,7 +57,7 @@ void usage(char *prog) {
printf("\t-g UHD Gain [Default %.2f dB]\n", uhd_gain); printf("\t-g UHD Gain [Default %.2f dB]\n", uhd_gain);
printf("\t-p nof_prb [Default %d]\n", nof_prb); printf("\t-p nof_prb [Default %d]\n", nof_prb);
printf("\t-n nof_subframes [Default %d]\n", nof_subframes); printf("\t-n nof_subframes [Default %d]\n", nof_subframes);
printf("\t-v srslte_verbose\n"); printf("\t-v verbose\n");
} }
void parse_args(int argc, char **argv) { void parse_args(int argc, char **argv) {
@ -104,25 +104,18 @@ int cuhd_recv_wrapper(void *h, void *data, uint32_t nsamples, srslte_timestamp_t
return cuhd_recv(h, data, nsamples, 1); return cuhd_recv(h, data, nsamples, 1);
} }
enum receiver_state { DECODE_MIB, SAVE_FILE} state;
int main(int argc, char **argv) { int main(int argc, char **argv) {
cf_t *buffer; cf_t *buffer;
int subframe_count, n; int n;
void *uhd; void *uhd;
srslte_filesink_t sink; srslte_filesink_t sink;
srslte_ue_mib_t ue_mib;
srslte_ue_sync_t ue_sync; srslte_ue_sync_t ue_sync;
srslte_cell_t cell; srslte_cell_t cell;
enum receiver_state state;
uint8_t bch_payload[BCH_PAYLOAD_LEN];
signal(SIGINT, int_handler); signal(SIGINT, int_handler);
parse_args(argc, argv); parse_args(argc, argv);
subframe_count = 0;
srslte_filesink_init(&sink, output_file_name, SRSLTE_COMPLEX_FLOAT_BIN); srslte_filesink_init(&sink, output_file_name, SRSLTE_COMPLEX_FLOAT_BIN);
printf("Opening UHD device...\n"); printf("Opening UHD device...\n");
@ -145,17 +138,12 @@ int main(int argc, char **argv) {
fprintf(stderr, "Error initiating ue_sync\n"); fprintf(stderr, "Error initiating ue_sync\n");
exit(-1); exit(-1);
} }
if (srslte_ue_mib_init(&ue_mib, cell)) {
fprintf(stderr, "Error initaiting UE MIB decoder\n"); uint32_t subframe_count = 0;
exit(-1); bool start_capture = false;
} bool stop_capture = false;
state = DECODE_MIB;
bool decoded_mib = false;
uint32_t sfn, sfn_offset;
printf("Waiting for SFN=0\n");
while((subframe_count < nof_subframes || nof_subframes == -1) while((subframe_count < nof_subframes || nof_subframes == -1)
&& keep_running) && !stop_capture)
{ {
n = srslte_ue_sync_get_buffer(&ue_sync, &buffer); n = srslte_ue_sync_get_buffer(&ue_sync, &buffer);
if (n < 0) { if (n < 0) {
@ -163,39 +151,20 @@ int main(int argc, char **argv) {
exit(-1); exit(-1);
} }
if (n == 1) { if (n == 1) {
switch (state) { if (!start_capture) {
case DECODE_MIB: if (srslte_ue_sync_get_sfidx(&ue_sync) == 9) {
if (srslte_ue_sync_get_sfidx(&ue_sync) == 0) { start_capture = true;
srslte_pbch_decode_reset(&ue_mib.pbch); }
n = srslte_ue_mib_decode(&ue_mib, buffer, bch_payload, NULL, &sfn_offset); } else {
if (n < 0) { printf("Writing to file %6d subframes...\r", subframe_count);
fprintf(stderr, "Error decoding UE MIB\n"); srslte_filesink_write(&sink, buffer, SRSLTE_SF_LEN_PRB(nof_prb));
exit(-1); subframe_count++;
} else if (n == SRSLTE_UE_MIB_FOUND) { }
srslte_pbch_mib_unpack(bch_payload, &cell, &sfn); }
sfn = (sfn + sfn_offset)%1024; if (!keep_running) {
decoded_mib = true; if (!start_capture || (start_capture && srslte_ue_sync_get_sfidx(&ue_sync) == 9)) {
} stop_capture = true;
}
if (decoded_mib && srslte_ue_sync_get_sfidx(&ue_sync) == 9 && sfn == 1023) {
srslte_pbch_mib_fprint(stdout, &cell, sfn, cell.id);
printf("Decoded MIB. SFN: %d\n", sfn);
state = SAVE_FILE;
}
break;
case SAVE_FILE:
printf("Writing to file %4d subframes...\r", subframe_count);
srslte_filesink_write(&sink, buffer, SRSLTE_SF_LEN_PRB(nof_prb));
subframe_count++;
break;
} }
if (srslte_ue_sync_get_sfidx(&ue_sync) == 9) {
sfn++;
if (sfn == 1024) {
sfn = 0;
}
}
} }
} }