Commit b4e48d88 authored by Raymond Knopp's avatar Raymond Knopp Committed by Robert Schmidt

Squashed commit of the following:

commit 4bbcf7cf
Merge: 6433c1f7 1fb76157
Author: Raymond Knopp <raymond.knopp@eurecom.fr>
Date:   Sat Sep 2 10:38:30 2017 +0200

    Merge branch 'develop' into develop-sidekiq

commit 6433c1f7
Author: Raymond Knopp <raymond.knopp@eurecom.fr>
Date:   Fri Sep 1 19:47:42 2017 +0200

    updates for CMakeLists.txt (for Sidekiq) and tracing in skiq_lib.c

commit f395cb54
Merge: c0725ddc 17b9a9e9
Author: Raymond Knopp <raymond.knopp@eurecom.fr>
Date:   Sun Aug 20 09:08:52 2017 +0200

    Merge branch 'develop' into develop-sidekiq

commit c0725ddc
Author: Raymond Knopp <raymond.knopp@eurecom.fr>
Date:   Sun Aug 20 08:55:24 2017 +0200

    some changes for sidekiq

commit cae97783
Merge: 2253c554 d0e2938b c124e32a
Author: Raymond Knopp <raymond.knopp@eurecom.fr>
Date:   Wed May 3 18:00:07 2017 +0200

    Merge branch 'develop', remote-tracking branch 'origin' into develop-sidekiq

commit 2253c554
Author: Raymond Knopp <raymond.knopp@eurecom.fr>
Date:   Tue Mar 21 19:04:29 2017 +0100

    fixes after merge with develop
    Y

commit 7c1bbb57
Merge: fbaf8a62 bd173433
Author: Raymond Knopp <raymond.knopp@eurecom.fr>
Date:   Tue Mar 21 18:52:03 2017 +0100

    Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-sidekiq

commit fbaf8a62
Author: Raymond Knopp <raymond.knopp@eurecom.fr>
Date:   Tue Mar 21 18:37:02 2017 +0100

    updates for Sidekiq

commit da500691
Author: Raymond Knopp <raymond.knopp@eurecom.fr>
Date:   Sun Mar 12 10:31:57 2017 +0100

    conflict resolution after merge with develop

commit 63e7c171
Merge: f8ee74de 5c375d3a
Author: Raymond Knopp <raymond.knopp@eurecom.fr>
Date:   Sun Mar 12 10:22:53 2017 +0100

    Merge remote-tracking branch 'origin/develop' into develop-sidekiq

commit f8ee74de
Author: Raymond Knopp <raymond.knopp@eurecom.fr>
Date:   Wed Jan 4 13:23:14 2017 -0500

    remove unused file

commit 2e310b8c
Author: Raymond Knopp <raymond.knopp@eurecom.fr>
Date:   Wed Jan 4 13:22:23 2017 -0500

    SKIQ library

commit 83f00909
Author: Raymond Knopp <raymond.knopp@eurecom.fr>
Date:   Wed Jan 4 13:21:30 2017 -0500

    modifications for sidekiq

commit 18d05df0
Merge: 09831815 3bf8768d
Author: Raymond Knopp <raymond.knopp@eurecom.fr>
Date:   Fri Dec 23 11:18:15 2016 -0500

    Merge remote-tracking branch 'origin/develop' into develop-sidekiq

commit 09831815
Author: Raymond Knopp <raymond.knopp@eurecom.fr>
Date:   Fri Dec 23 11:08:42 2016 -0500

    changes for sidekiq

commit 467384bc
Merge: 933e874c 9927838e
Author: Raymond Knopp <raymond.knopp@eurecom.fr>
Date:   Wed Oct 26 17:07:11 2016 -0400

    Merge branch 'develop' into develop-sidekiq

commit 933e874c
Author: Raymond Knopp <raymond.knopp@eurecom.fr>
Date:   Wed Oct 26 17:05:39 2016 -0400

    added skeleton for Sidekiq

commit 3185d596
Merge: e86ec117 82e54108
Author: Raymond Knopp <raymond.knopp@eurecom.fr>
Date:   Wed Oct 26 17:04:14 2016 -0400

    Merge remote-tracking branch 'origin' into develop-sidekiq
parent 6d030ea2
......@@ -743,6 +743,15 @@ set(HWLIB_BLADERF_SOURCE
add_library(oai_bladerfdevif MODULE ${HWLIB_BLADERF_SOURCE} )
target_link_libraries(oai_bladerfdevif bladeRF)
set (SKIQ_SDK $ENV{SKIQ_SDK})
set (option_HWSKIQLIB_lib "-L ${SKIQ_SDK}/lib/support/x86_64.gcc/usr/lib/epiq ${SKIQ_SDK}/lib/libsidekiq__x86_64.gcc.a ${SKIQ_SDK}/arg_parser/lib/arg_parser__x86_64.gcc.a -lglib-2.0 -Wl,--enable-new-dtags -Wl,-rpath,/usr/lib/epiq ")
add_library(oai_skiqdevif MODULE ${OPENAIR_TARGETS}/ARCH/SKIQ/USERSPACE/LIB/skiq_lib.c)
FIND_LIBRARY(LIBSIDEKIQ NAMES "libsidekiq__x86_64.gcc.a" "arg_parser__x86_64.gcc.a" PATHS ${SKIQ_SDK}/lib NO_DEFAULT_PATH)
target_link_libraries(oai_skiqdevif ${LIBSIDEKIQ})
target_include_directories(oai_skiqdevif PRIVATE "${SKIQ_SDK}/sidekiq_core/inc")
target_include_directories(oai_skiqdevif PRIVATE "${OPENAIR_TARGETS}/ARCH/SKIQ/USERSPACE/LIB/")
set (CMAKE_SHARED_LINKER_FLAGS "-lglib-2.0 -Wl,--enable-new-dtags -Wl,-rpath,/usr/lib/epiq")
include_directories("${OPENAIR_TARGETS}/ARCH/LMSSDR/USERSPACE/LIB/")
set(HWLIB_LMSSDR_SOURCE
......
......@@ -110,7 +110,7 @@ Options:
--UE-gen-nvram [output path]
Specify gen_nvram_path (default \"$gen_nvram_path\")
-w | --hardware
EXMIMO, USRP, BLADERF, LMSSDR, IRIS, ADRV9371_ZC706, SIMU, AW2SORI, None (Default)
EXMIMO, USRP, SKIQ, BLADERF, LMSSDR, IRIS, ADRV9371_ZC706, SIMU, AW2SORI, None (Default)
Adds this RF board support (in external packages installation and in compilation)
-t | --transport
Selects the transport protocol type, options: None, Ethernet, benetel4g, benetel5g
......@@ -300,7 +300,7 @@ function main() {
"EXMIMO")
HW="EXMIMO"
;;
"USRP" | "BLADERF" | "LMSSDR" | "IRIS" | "ADRV9371_ZC706" | "SIMU" | "AW2SORI")
"USRP" | "SKIQ" | "BLADERF" | "LMSSDR" | "IRIS" | "ADRV9371_ZC706" | "SIMU" | "AW2SORI")
HW="OAI_"$2
;;
"None")
......@@ -584,6 +584,10 @@ function main() {
# flash_firmware_iris
#fi
fi
if [ "$HW" == "OAI_SKIQ" ] ; then
echo_info "installing packages for SKIQ support"
check_install_skiq_driver
fi
echo_info "Installing protobuf/protobuf-c for flexran agent support"
install_protobuf_c
echo_success "protobuf/protobuf-c installation successful"
......@@ -859,6 +863,15 @@ function main() {
ln -sf liboai_usrpdevif.so liboai_device.so
ln -sf $dbin/liboai_usrpdevif.so.$REL $dbin/liboai_device.so
echo_info "liboai_device.so is linked to USRP device library"
elif [ "$HW" == "OAI_SKIQ" ] ; then
if [ -f $SKIQ_SDK/sidekiq_core/inc ] ; then
compilations \
$build_dir oai_skiqdevif \
liboai_skiqdevif.so $dbin/liboai_skiqdevif.so.$REL
fi
ln -s liboai_skiqdevif.so liboai_device.so
ln -s $dbin/liboai_skiqdevif.so.$REL $dbin/liboai_device.so
echo_info "liboai_device.so is linked to SIDEKIQ device library"
elif [ "$HW" == "OAI_BLADERF" ] ; then
if [ -f "/usr/include/libbladeRF.h" ] ; then
compilations \
......
......@@ -53,6 +53,7 @@ const char* devtype_names[MAX_RF_DEV_TYPE] = {
"BLADERF",
"LMSSDR",
"IRIS",
"SKIQ",
"No HW",
"ADRV9371_ZC706",
"UEDv2",
......
......@@ -98,6 +98,8 @@ typedef enum {
LMSSDR_DEV,
/*!\brief device is Iris */
IRIS_DEV,
/*!\brief device is SKIQ*/
SKIQ_DEV,
/*!\brief device is NONE*/
NONE_DEV,
/*!\brief device is ADRV9371_ZC706 */
......
This diff is collapsed.
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