diff options
Diffstat (limited to 'src/target/firmware')
40 files changed, 54 insertions, 55 deletions
diff --git a/src/target/firmware/Makefile b/src/target/firmware/Makefile index ad46fb54..301bb313 100644 --- a/src/target/firmware/Makefile +++ b/src/target/firmware/Makefile @@ -68,8 +68,7 @@ RF_OBJS=rf/trf6151.o # Objects that go in all applications ANY_APP_OBJS+=$(ABB_OBJS) $(RF_OBJS) $(DISPLAY_OBJS) $(FLASH_OBJS) -ANY_APP_LIBS+=calypso/libcalypso.a layer1/liblayer1.a lib/libmini.a comm/libcomm.a ../../shared/libosmocore/build-target/src/.libs/libosmocore.a - +ANY_APP_LIBS+=calypso/libcalypso.a layer1/liblayer1.a lib/libmini.a comm/libcomm.a ../../shared/libosmocore/build-target/src/.libs/libosmocore.a ../../shared/libosmocore/build-target/src/gsm/.libs/libosmogsm.a # Libraries are defined in subdirectories -include calypso/Makefile diff --git a/src/target/firmware/apps/loader/main.c b/src/target/firmware/apps/loader/main.c index 04b337bc..4e71d982 100644 --- a/src/target/firmware/apps/loader/main.c +++ b/src/target/firmware/apps/loader/main.c @@ -33,7 +33,7 @@ #include <console.h> #include <manifest.h> -#include <osmocore/crc16.h> +#include <osmocom/core/crc16.h> #include <abb/twl3025.h> #include <rf/trf6151.h> diff --git a/src/target/firmware/board/compal/rf_power.c b/src/target/firmware/board/compal/rf_power.c index 71033aea..fbbe65a3 100644 --- a/src/target/firmware/board/compal/rf_power.c +++ b/src/target/firmware/board/compal/rf_power.c @@ -21,7 +21,7 @@ */ #include <stdint.h> -#include <osmocore/utils.h> +#include <osmocom/core/utils.h> /* GSM900 ARFCN 33, Measurements by Steve Markgraf / May 2010 */ const int16_t dbm2apc_gsm900[] = { diff --git a/src/target/firmware/board/gta0x/rf_power.c b/src/target/firmware/board/gta0x/rf_power.c index 645c8a39..1c896f74 100644 --- a/src/target/firmware/board/gta0x/rf_power.c +++ b/src/target/firmware/board/gta0x/rf_power.c @@ -21,7 +21,7 @@ */ #include <stdint.h> -#include <osmocore/utils.h> +#include <osmocom/core/utils.h> /* GSM900 ARFCN 33, Measurements by Steve Markgraf / May 2010 */ /* FIXME those are from compal ... need real GTA calibration */ diff --git a/src/target/firmware/board/pirelli_dpl10/rf_power.c b/src/target/firmware/board/pirelli_dpl10/rf_power.c index 34e74097..9b89847d 100644 --- a/src/target/firmware/board/pirelli_dpl10/rf_power.c +++ b/src/target/firmware/board/pirelli_dpl10/rf_power.c @@ -21,7 +21,7 @@ */ #include <stdint.h> -#include <osmocore/utils.h> +#include <osmocom/core/utils.h> /* GSM900 ARFCN 33, Measurements by Steve Markgraf / May 2010 */ /* FIXME those are from the Compal phones, do measurements with the DP-L10 */ diff --git a/src/target/firmware/calypso/dsp.c b/src/target/firmware/calypso/dsp.c index f22a7e0e..5a17c5af 100644 --- a/src/target/firmware/calypso/dsp.c +++ b/src/target/firmware/calypso/dsp.c @@ -34,7 +34,7 @@ #include <abb/twl3025.h> -#include <osmocore/gsm_utils.h> +#include <osmocom/gsm/gsm_utils.h> #define REG_API_CONTROL 0xfffe0000 diff --git a/src/target/firmware/comm/msgb.c b/src/target/firmware/comm/msgb.c index d412844c..ff18e65b 100644 --- a/src/target/firmware/comm/msgb.c +++ b/src/target/firmware/comm/msgb.c @@ -26,7 +26,7 @@ #include <debug.h> #include <delay.h> -#include <osmocore/msgb.h> +#include <osmocom/core/msgb.h> #include <calypso/backlight.h> diff --git a/src/target/firmware/comm/sercomm.c b/src/target/firmware/comm/sercomm.c index 0263f7d6..d7f60366 100644 --- a/src/target/firmware/comm/sercomm.c +++ b/src/target/firmware/comm/sercomm.c @@ -24,7 +24,7 @@ #include <stdio.h> #include <errno.h> -#include <osmocore/msgb.h> +#include <osmocom/core/msgb.h> #ifdef HOST_BUILD #define SERCOMM_RX_MSG_SIZE 2048 @@ -39,7 +39,7 @@ #else #define SERCOMM_RX_MSG_SIZE 256 #include <debug.h> -#include <osmocore/linuxlist.h> +#include <osmocom/core/linuxlist.h> #include <asm/system.h> #include <comm/sercomm.h> diff --git a/src/target/firmware/comm/sercomm_cons.c b/src/target/firmware/comm/sercomm_cons.c index 5d7842fb..987c9920 100644 --- a/src/target/firmware/comm/sercomm_cons.c +++ b/src/target/firmware/comm/sercomm_cons.c @@ -29,7 +29,7 @@ #include <calypso/uart.h> #include <console.h> -#include <osmocore/msgb.h> +#include <osmocom/core/msgb.h> #include <comm/sercomm.h> #include <comm/sercomm_cons.h> diff --git a/src/target/firmware/comm/timer.c b/src/target/firmware/comm/timer.c index 9799cfc5..54abc793 100644 --- a/src/target/firmware/comm/timer.c +++ b/src/target/firmware/comm/timer.c @@ -20,7 +20,7 @@ #include <stdint.h> #include <debug.h> -#include <osmocore/linuxlist.h> +#include <osmocom/core/linuxlist.h> #include <comm/timer.h> diff --git a/src/target/firmware/include/comm/msgb.h b/src/target/firmware/include/comm/msgb.h index 3113fa2c..10cff9b2 100644 --- a/src/target/firmware/include/comm/msgb.h +++ b/src/target/firmware/include/comm/msgb.h @@ -20,7 +20,7 @@ * */ -#include <osmocore/linuxlist.h> +#include <osmocom/core/linuxlist.h> #include <console.h> struct msgb { diff --git a/src/target/firmware/include/comm/sercomm.h b/src/target/firmware/include/comm/sercomm.h index 8fbbff97..54256b5a 100644 --- a/src/target/firmware/include/comm/sercomm.h +++ b/src/target/firmware/include/comm/sercomm.h @@ -3,7 +3,7 @@ /* SERCOMM layer on UART1 (modem UART) */ -#include <osmocore/msgb.h> +#include <osmocom/core/msgb.h> #define SERCOMM_UART_NR 1 diff --git a/src/target/firmware/include/comm/timer.h b/src/target/firmware/include/comm/timer.h index 814d2c60..42bf7343 100644 --- a/src/target/firmware/include/comm/timer.h +++ b/src/target/firmware/include/comm/timer.h @@ -23,7 +23,7 @@ #include <sys/time.h> -#include <osmocore/linuxlist.h> +#include <osmocom/core/linuxlist.h> /** * Timer management: diff --git a/src/target/firmware/include/layer1/async.h b/src/target/firmware/include/layer1/async.h index f8d6b716..93c50778 100644 --- a/src/target/firmware/include/layer1/async.h +++ b/src/target/firmware/include/layer1/async.h @@ -1,7 +1,7 @@ #ifndef _L1_ASYNC_H #define _L1_ASYNC_H -#include <osmocore/msgb.h> +#include <osmocom/core/msgb.h> #include <layer1/mframe_sched.h> diff --git a/src/target/firmware/include/layer1/l23_api.h b/src/target/firmware/include/layer1/l23_api.h index b1602705..9b10b62a 100644 --- a/src/target/firmware/include/layer1/l23_api.h +++ b/src/target/firmware/include/layer1/l23_api.h @@ -2,7 +2,7 @@ #define _L1_L23_API_H #include <stdint.h> -#include <osmocore/msgb.h> +#include <osmocom/core/msgb.h> #include <l1ctl_proto.h> void l1a_l23api_init(void); diff --git a/src/target/firmware/include/layer1/sched_gsmtime.h b/src/target/firmware/include/layer1/sched_gsmtime.h index 630c6163..c40359ea 100644 --- a/src/target/firmware/include/layer1/sched_gsmtime.h +++ b/src/target/firmware/include/layer1/sched_gsmtime.h @@ -2,7 +2,7 @@ #define _L1_SCHED_GSMTIME_H #include <stdint.h> -#include <osmocore/linuxlist.h> +#include <osmocom/core/linuxlist.h> struct sched_gsmtime_event { struct llist_head list; diff --git a/src/target/firmware/include/layer1/sync.h b/src/target/firmware/include/layer1/sync.h index 879e4cfb..07962052 100644 --- a/src/target/firmware/include/layer1/sync.h +++ b/src/target/firmware/include/layer1/sync.h @@ -1,8 +1,8 @@ #ifndef _L1_SYNC_H #define _L1_SYNC_H -#include <osmocore/linuxlist.h> -#include <osmocore/gsm_utils.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/gsm/gsm_utils.h> #include <layer1/tdma_sched.h> #include <layer1/mframe_sched.h> #include <l1ctl_proto.h> diff --git a/src/target/firmware/include/rf/trf6151.h b/src/target/firmware/include/rf/trf6151.h index 1a908087..73ff8c09 100644 --- a/src/target/firmware/include/rf/trf6151.h +++ b/src/target/firmware/include/rf/trf6151.h @@ -1,7 +1,7 @@ #ifndef _TRF6151_H #define _TRF6151_H -#include <osmocore/gsm_utils.h> +#include <osmocom/gsm/gsm_utils.h> /* initialize (reset + power up) */ void trf6151_init(uint8_t tsp_uid, uint16_t tsp_reset_id); diff --git a/src/target/firmware/include/rffe.h b/src/target/firmware/include/rffe.h index 950e597e..a21d183f 100644 --- a/src/target/firmware/include/rffe.h +++ b/src/target/firmware/include/rffe.h @@ -1,7 +1,7 @@ #ifndef _RFFE_H #define _RFFE_H -#include <osmocore/gsm_utils.h> +#include <osmocom/gsm/gsm_utils.h> extern const uint8_t system_inherent_gain; diff --git a/src/target/firmware/layer1/afc.c b/src/target/firmware/layer1/afc.c index 92545a7f..a51a1071 100644 --- a/src/target/firmware/layer1/afc.c +++ b/src/target/firmware/layer1/afc.c @@ -24,7 +24,7 @@ #include <stdio.h> #include <debug.h> -#include <osmocore/gsm_utils.h> +#include <osmocom/gsm/gsm_utils.h> #include <layer1/afc.h> #include <layer1/avg.h> diff --git a/src/target/firmware/layer1/agc.c b/src/target/firmware/layer1/agc.c index 780e260f..b72a6e74 100644 --- a/src/target/firmware/layer1/agc.c +++ b/src/target/firmware/layer1/agc.c @@ -23,7 +23,7 @@ #include <stdint.h> #include <stdio.h> -#include <osmocore/gsm_utils.h> +#include <osmocom/gsm/gsm_utils.h> #include <debug.h> #include <rffe.h> diff --git a/src/target/firmware/layer1/apc.c b/src/target/firmware/layer1/apc.c index 5cff191b..480c7607 100644 --- a/src/target/firmware/layer1/apc.c +++ b/src/target/firmware/layer1/apc.c @@ -22,8 +22,8 @@ #include <errno.h> -#include <osmocore/utils.h> -#include <osmocore/gsm_utils.h> +#include <osmocom/core/utils.h> +#include <osmocom/gsm/gsm_utils.h> #include <layer1/apc.h> diff --git a/src/target/firmware/layer1/async.c b/src/target/firmware/layer1/async.c index 76d0b721..e5c80c7c 100644 --- a/src/target/firmware/layer1/async.c +++ b/src/target/firmware/layer1/async.c @@ -26,8 +26,8 @@ #include <arm.h> #include <asm/system.h> -#include <osmocore/msgb.h> -#include <osmocore/protocol/gsm_04_08.h> +#include <osmocom/core/msgb.h> +#include <osmocom/gsm/protocol/gsm_04_08.h> #include <layer1/sync.h> #include <layer1/async.h> diff --git a/src/target/firmware/layer1/l23_api.c b/src/target/firmware/layer1/l23_api.c index aef12a59..2e951601 100644 --- a/src/target/firmware/layer1/l23_api.c +++ b/src/target/firmware/layer1/l23_api.c @@ -29,8 +29,8 @@ #include <debug.h> #include <byteorder.h> -#include <osmocore/msgb.h> -#include <osmocore/protocol/gsm_04_08.h> +#include <osmocom/core/msgb.h> +#include <osmocom/gsm/protocol/gsm_04_08.h> #include <comm/sercomm.h> #include <layer1/sync.h> diff --git a/src/target/firmware/layer1/mframe_sched.c b/src/target/firmware/layer1/mframe_sched.c index 326f6603..428102a7 100644 --- a/src/target/firmware/layer1/mframe_sched.c +++ b/src/target/firmware/layer1/mframe_sched.c @@ -26,7 +26,7 @@ #include <debug.h> -#include <osmocore/gsm_utils.h> +#include <osmocom/gsm/gsm_utils.h> #include <layer1/prim.h> #include <layer1/sync.h> diff --git a/src/target/firmware/layer1/prim_fbsb.c b/src/target/firmware/layer1/prim_fbsb.c index d46e4a42..124a3162 100644 --- a/src/target/firmware/layer1/prim_fbsb.c +++ b/src/target/firmware/layer1/prim_fbsb.c @@ -30,8 +30,8 @@ #include <debug.h> #include <memory.h> #include <byteorder.h> -#include <osmocore/gsm_utils.h> -#include <osmocore/msgb.h> +#include <osmocom/gsm/gsm_utils.h> +#include <osmocom/core/msgb.h> #include <calypso/dsp_api.h> #include <calypso/irq.h> #include <calypso/tpu.h> diff --git a/src/target/firmware/layer1/prim_freq.c b/src/target/firmware/layer1/prim_freq.c index 7878be68..88bc4532 100644 --- a/src/target/firmware/layer1/prim_freq.c +++ b/src/target/firmware/layer1/prim_freq.c @@ -29,8 +29,8 @@ #include <debug.h> #include <memory.h> #include <byteorder.h> -#include <osmocore/gsm_utils.h> -#include <osmocore/msgb.h> +#include <osmocom/gsm/gsm_utils.h> +#include <osmocom/core/msgb.h> #include <calypso/dsp_api.h> #include <calypso/irq.h> #include <calypso/tpu.h> diff --git a/src/target/firmware/layer1/prim_pm.c b/src/target/firmware/layer1/prim_pm.c index 134bffde..5d2f413c 100644 --- a/src/target/firmware/layer1/prim_pm.c +++ b/src/target/firmware/layer1/prim_pm.c @@ -29,8 +29,8 @@ #include <debug.h> #include <memory.h> #include <byteorder.h> -#include <osmocore/gsm_utils.h> -#include <osmocore/msgb.h> +#include <osmocom/gsm/gsm_utils.h> +#include <osmocom/core/msgb.h> #include <calypso/dsp_api.h> #include <calypso/irq.h> #include <calypso/tpu.h> diff --git a/src/target/firmware/layer1/prim_rach.c b/src/target/firmware/layer1/prim_rach.c index b0e7288d..47f74241 100644 --- a/src/target/firmware/layer1/prim_rach.c +++ b/src/target/firmware/layer1/prim_rach.c @@ -30,8 +30,8 @@ #include <debug.h> #include <memory.h> #include <byteorder.h> -#include <osmocore/gsm_utils.h> -#include <osmocore/msgb.h> +#include <osmocom/gsm/gsm_utils.h> +#include <osmocom/core/msgb.h> #include <calypso/dsp_api.h> #include <calypso/irq.h> #include <calypso/tpu.h> diff --git a/src/target/firmware/layer1/prim_rx_nb.c b/src/target/firmware/layer1/prim_rx_nb.c index 80002884..ea902677 100644 --- a/src/target/firmware/layer1/prim_rx_nb.c +++ b/src/target/firmware/layer1/prim_rx_nb.c @@ -29,8 +29,8 @@ #include <debug.h> #include <memory.h> #include <byteorder.h> -#include <osmocore/gsm_utils.h> -#include <osmocore/msgb.h> +#include <osmocom/gsm/gsm_utils.h> +#include <osmocom/core/msgb.h> #include <calypso/dsp_api.h> #include <calypso/irq.h> #include <calypso/tpu.h> diff --git a/src/target/firmware/layer1/prim_tch.c b/src/target/firmware/layer1/prim_tch.c index d525ce15..013318d4 100644 --- a/src/target/firmware/layer1/prim_tch.c +++ b/src/target/firmware/layer1/prim_tch.c @@ -30,9 +30,9 @@ #include <debug.h> #include <memory.h> #include <byteorder.h> -#include <osmocore/gsm_utils.h> -#include <osmocore/protocol/gsm_04_08.h> -#include <osmocore/msgb.h> +#include <osmocom/gsm/gsm_utils.h> +#include <osmocom/gsm/protocol/gsm_04_08.h> +#include <osmocom/core/msgb.h> #include <calypso/dsp_api.h> #include <calypso/irq.h> #include <calypso/tpu.h> diff --git a/src/target/firmware/layer1/prim_tx_nb.c b/src/target/firmware/layer1/prim_tx_nb.c index 4989bf56..3038178b 100644 --- a/src/target/firmware/layer1/prim_tx_nb.c +++ b/src/target/firmware/layer1/prim_tx_nb.c @@ -30,8 +30,8 @@ #include <debug.h> #include <memory.h> #include <byteorder.h> -#include <osmocore/gsm_utils.h> -#include <osmocore/msgb.h> +#include <osmocom/gsm/gsm_utils.h> +#include <osmocom/core/msgb.h> #include <calypso/dsp_api.h> #include <calypso/irq.h> #include <calypso/tpu.h> diff --git a/src/target/firmware/layer1/prim_utils.c b/src/target/firmware/layer1/prim_utils.c index 5d6c71c7..c85da717 100644 --- a/src/target/firmware/layer1/prim_utils.c +++ b/src/target/firmware/layer1/prim_utils.c @@ -22,7 +22,7 @@ #include <stdint.h> -#include <osmocore/msgb.h> +#include <osmocom/core/msgb.h> #include <layer1/sync.h> diff --git a/src/target/firmware/layer1/rfch.c b/src/target/firmware/layer1/rfch.c index 5627b7e4..d0818d04 100644 --- a/src/target/firmware/layer1/rfch.c +++ b/src/target/firmware/layer1/rfch.c @@ -22,7 +22,7 @@ #include <stdint.h> -#include <osmocore/gsm_utils.h> +#include <osmocom/gsm/gsm_utils.h> #include <layer1/sync.h> diff --git a/src/target/firmware/layer1/sched_gsmtime.c b/src/target/firmware/layer1/sched_gsmtime.c index ba3bac70..01e22ca3 100644 --- a/src/target/firmware/layer1/sched_gsmtime.c +++ b/src/target/firmware/layer1/sched_gsmtime.c @@ -24,7 +24,7 @@ #include <errno.h> #include <debug.h> -#include <osmocore/linuxlist.h> +#include <osmocom/core/linuxlist.h> #include <layer1/tdma_sched.h> #include <layer1/sched_gsmtime.h> diff --git a/src/target/firmware/layer1/sync.c b/src/target/firmware/layer1/sync.c index 3397dc03..36f42975 100644 --- a/src/target/firmware/layer1/sync.c +++ b/src/target/firmware/layer1/sync.c @@ -33,8 +33,8 @@ #include <byteorder.h> #include <asm/system.h> -#include <osmocore/gsm_utils.h> -#include <osmocore/msgb.h> +#include <osmocom/gsm/gsm_utils.h> +#include <osmocom/core/msgb.h> #include <calypso/dsp_api.h> #include <calypso/irq.h> #include <calypso/tpu.h> diff --git a/src/target/firmware/layer1/tdma_sched.c b/src/target/firmware/layer1/tdma_sched.c index 013d305a..88129922 100644 --- a/src/target/firmware/layer1/tdma_sched.c +++ b/src/target/firmware/layer1/tdma_sched.c @@ -26,7 +26,7 @@ #include <defines.h> #include <debug.h> -#include <osmocore/gsm_utils.h> +#include <osmocom/gsm/gsm_utils.h> #include <layer1/tdma_sched.h> #include <layer1/sync.h> diff --git a/src/target/firmware/layer1/toa.c b/src/target/firmware/layer1/toa.c index adb32f2d..7d80d952 100644 --- a/src/target/firmware/layer1/toa.c +++ b/src/target/firmware/layer1/toa.c @@ -25,7 +25,7 @@ #include <stdio.h> #include <debug.h> -#include <osmocore/gsm_utils.h> +#include <osmocom/gsm/gsm_utils.h> #include <layer1/toa.h> #include <layer1/avg.h> diff --git a/src/target/firmware/rf/mt6139.c b/src/target/firmware/rf/mt6139.c index 6103646a..a9a6d32e 100644 --- a/src/target/firmware/rf/mt6139.c +++ b/src/target/firmware/rf/mt6139.c @@ -26,7 +26,7 @@ #include <debug.h> #include <memory.h> #include <keypad.h> -#include <osmocore/gsm_utils.h> +#include <osmocom/gsm/gsm_utils.h> #include <layer1/agc.h> #include <rffe.h> diff --git a/src/target/firmware/rf/trf6151.c b/src/target/firmware/rf/trf6151.c index 0efe5273..7391ef82 100644 --- a/src/target/firmware/rf/trf6151.c +++ b/src/target/firmware/rf/trf6151.c @@ -26,7 +26,7 @@ #include <debug.h> #include <memory.h> #include <keypad.h> -#include <osmocore/gsm_utils.h> +#include <osmocom/gsm/gsm_utils.h> #include <calypso/tpu.h> #include <calypso/tsp.h> |