Commit efac37e1 authored by wangdong's avatar wangdong
parents 1e51f954 ade89ea2
...@@ -35,4 +35,9 @@ echo "-lcjson -ls2j -lsocket" ...@@ -35,4 +35,9 @@ echo "-lcjson -ls2j -lsocket"
sed -e '/target_link_libraries (lte-softmodem -lsocket -ls2j -lcjson)/d' $OPENAIR_HOME/cmake_targets/CMakeLists.txt > $OPENAIR_HOME/cmake_targets/CMakeLists2.txt sed -e '/target_link_libraries (lte-softmodem -lsocket -ls2j -lcjson)/d' $OPENAIR_HOME/cmake_targets/CMakeLists.txt > $OPENAIR_HOME/cmake_targets/CMakeLists2.txt
rm -rf $OPENAIR_HOME/cmake_targets/CMakeLists.txt rm -rf $OPENAIR_HOME/cmake_targets/CMakeLists.txt
cp $OPENAIR_HOME/cmake_targets/CMakeLists2.txt $OPENAIR_HOME/cmake_targets/CMakeLists.txt cp $OPENAIR_HOME/cmake_targets/CMakeLists2.txt $OPENAIR_HOME/cmake_targets/CMakeLists.txt
sed -i '/target_link_libraries (lte-softmodem ${T_LIB})/a\target_link_libraries (lte-softmodem -lsocket -ls2j -lcjson)' $OPENAIR_HOME/cmake_targets/CMakeLists.txt sed -i '/target_link_libraries (lte-softmodem ${T_LIB})/a\target_link_libraries (nr-softmodem -lsocket -ls2j -lcjson)' $OPENAIR_HOME/cmake_targets/CMakeLists.txt
\ No newline at end of file
sed -e '/target_link_libraries (nr-softmodem -lsocket -ls2j -lcjson)/d' $OPENAIR_HOME/cmake_targets/CMakeLists.txt > $OPENAIR_HOME/cmake_targets/CMakeLists2.txt
rm -rf $OPENAIR_HOME/cmake_targets/CMakeLists.txt
cp $OPENAIR_HOME/cmake_targets/CMakeLists2.txt $OPENAIR_HOME/cmake_targets/CMakeLists.txt
sed -i '/target_link_libraries (nr-softmodem ${T_LIB})/a\target_link_libraries (nr-softmodem -lsocket -ls2j -lcjson)' $OPENAIR_HOME/cmake_targets/CMakeLists.txt
\ No newline at end of file
...@@ -2674,6 +2674,7 @@ target_link_libraries (lte-softmodem ${T_LIB}) ...@@ -2674,6 +2674,7 @@ target_link_libraries (lte-softmodem ${T_LIB})
target_link_libraries (lte-softmodem -lsocket -ls2j -lcjson) target_link_libraries (lte-softmodem -lsocket -ls2j -lcjson)
add_executable(ocp-enb add_executable(ocp-enb
${OPENAIR_DIR}/executables/main-ocp.c ${OPENAIR_DIR}/executables/main-ocp.c
${OPENAIR_DIR}/common/utils/threadPool/thread-pool.c ${OPENAIR_DIR}/common/utils/threadPool/thread-pool.c
...@@ -2826,6 +2827,10 @@ target_link_libraries (nr-softmodem pthread m ${CONFIG_LIB} rt crypt ${CRYPTO_LI ...@@ -2826,6 +2827,10 @@ target_link_libraries (nr-softmodem pthread m ${CONFIG_LIB} rt crypt ${CRYPTO_LI
target_link_libraries (nr-softmodem ${LIB_LMS_LIBRARIES}) target_link_libraries (nr-softmodem ${LIB_LMS_LIBRARIES})
target_link_libraries (nr-softmodem ${T_LIB}) target_link_libraries (nr-softmodem ${T_LIB})
target_link_libraries (nr-softmodem -lsocket -ls2j -lcjson) target_link_libraries (nr-softmodem -lsocket -ls2j -lcjson)
<<<<<<< HEAD
=======
>>>>>>> ade89ea2c860b72d368b3c03089889a6211e9255
add_dependencies( nr-softmodem ldpc_orig ldpc_optim ldpc_optim8seg ldpc ) add_dependencies( nr-softmodem ldpc_orig ldpc_optim ldpc_optim8seg ldpc )
# nr-uesoftmodem is UE implementation # nr-uesoftmodem is UE implementation
####################################### #######################################
......
...@@ -505,11 +505,19 @@ skip_ue: ...@@ -505,11 +505,19 @@ skip_ue:
//* 分配的结果:将结果都存储到了 ue_ctrl->rballoc_sub_UE[CC_id][rbg] 之中!!!,最后所有rbg都分配 //* 分配的结果:将结果都存储到了 ue_ctrl->rballoc_sub_UE[CC_id][rbg] 之中!!!,最后所有rbg都分配
} }
<<<<<<< HEAD
default_sched_dl_algo_t round_robin_dl = { default_sched_dl_algo_t round_robin_dl = {
.name = "round_robin_dl", .name = "round_robin_dl",
.setup = rr_dl_setup, .setup = rr_dl_setup,
.unset = rr_dl_unset, .unset = rr_dl_unset,
.run = rr_dl_run, .run = rr_dl_run,
=======
default_sched_dl_algo_t ai_dl = {
.name = "ai_dl",
.setup = ai_dl_setup,
.unset = ai_dl_unset,
.run = ai_dl_run,
>>>>>>> ade89ea2c860b72d368b3c03089889a6211e9255
.data = NULL .data = NULL
}; };
......
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