[PATCH 7/8] firmware: correct function declarations

this eliminates the occurrance of gcc warnings warning: implicit declaration of function ‘?’ warning: redundant redeclaration of ‘?’ --- src/target/firmware/apps/chainload/main.c | 1 + src/target/firmware/apps/loader/main.c | 1 + src/target/firmware/board/compal_e86/init.c | 1 + src/target/firmware/board/compal_e99/init.c | 1 + src/target/firmware/board/se_j100/init.c | 1 + src/target/firmware/include/layer1/async.h | 8 ++------ src/target/firmware/include/layer1/prim.h | 2 ++ src/target/firmware/layer1/l23_api.c | 4 ++-- src/target/firmware/layer1/prim_fbsb.c | 2 ++ src/target/firmware/layer1/prim_freq.c | 1 + src/target/firmware/layer1/prim_rach.c | 1 + src/target/firmware/layer1/prim_rx_nb.c | 2 ++ src/target/firmware/layer1/tpu_window.c | 1 + 13 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/target/firmware/apps/chainload/main.c b/src/target/firmware/apps/chainload/main.c index 5121837..9dfa217 100644 --- a/src/target/firmware/apps/chainload/main.c +++ b/src/target/firmware/apps/chainload/main.c @@ -29,6 +29,7 @@ #include <delay.h> #include <calypso/clock.h> +#include <calypso/timer.h> /* Main Program */ diff --git a/src/target/firmware/apps/loader/main.c b/src/target/firmware/apps/loader/main.c index b4c51de..4ff3b6a 100644 --- a/src/target/firmware/apps/loader/main.c +++ b/src/target/firmware/apps/loader/main.c @@ -47,6 +47,7 @@ #include <calypso/misc.h> #include <uart.h> #include <calypso/timer.h> +#include <calypso/backlight.h> #include <flash/cfi_flash.h> diff --git a/src/target/firmware/board/compal_e86/init.c b/src/target/firmware/board/compal_e86/init.c index 1de6193..9dbda0e 100644 --- a/src/target/firmware/board/compal_e86/init.c +++ b/src/target/firmware/board/compal_e86/init.c @@ -41,6 +41,7 @@ #include <calypso/backlight.h> #include <comm/sercomm.h> +#include <comm/timer.h> #include <abb/twl3025.h> #include <rf/trf6151.h> diff --git a/src/target/firmware/board/compal_e99/init.c b/src/target/firmware/board/compal_e99/init.c index 0c218a8..1c76749 100644 --- a/src/target/firmware/board/compal_e99/init.c +++ b/src/target/firmware/board/compal_e99/init.c @@ -41,6 +41,7 @@ #include <calypso/backlight.h> #include <comm/sercomm.h> +#include <comm/timer.h> #include <abb/twl3025.h> #include <rf/trf6151.h> diff --git a/src/target/firmware/board/se_j100/init.c b/src/target/firmware/board/se_j100/init.c index 30c3e6b..e8691cf 100644 --- a/src/target/firmware/board/se_j100/init.c +++ b/src/target/firmware/board/se_j100/init.c @@ -41,6 +41,7 @@ #include <calypso/backlight.h> #include <comm/sercomm.h> +#include <comm/timer.h> #include <abb/twl3025.h> #include <rf/trf6151.h> diff --git a/src/target/firmware/include/layer1/async.h b/src/target/firmware/include/layer1/async.h index a9fa08d..0935ec3 100644 --- a/src/target/firmware/include/layer1/async.h +++ b/src/target/firmware/include/layer1/async.h @@ -32,18 +32,14 @@ int l1a_txq_msgb_count(struct llist_head *queue); /* flush all pending msgb */ void l1a_txq_msgb_flush(struct llist_head *queue); -/* request a RACH */ -void l1a_rach_req(uint16_t offset, uint8_t combined, uint8_t ra); - -/* schedule frequency change */ -void l1a_freq_req(uint32_t fn_sched); - /* Enable a repeating multiframe task */ void l1a_mftask_enable(enum mframe_task task); /* Disable a repeating multiframe task */ void l1a_mftask_disable(enum mframe_task task); +void l1a_mftask_set(uint32_t tasks); + /* Set TCH mode */ uint8_t l1a_tch_mode_set(uint8_t mode); diff --git a/src/target/firmware/include/layer1/prim.h b/src/target/firmware/include/layer1/prim.h index 30c51ae..f01d64e 100644 --- a/src/target/firmware/include/layer1/prim.h +++ b/src/target/firmware/include/layer1/prim.h @@ -19,7 +19,9 @@ void l1s_pm_test(uint8_t base_fn, uint16_t arfcn); void l1s_nb_test(uint8_t base_fn); void l1s_fbsb_req(uint8_t base_fn, struct l1ctl_fbsb_req *req); +/* schedule frequency change */ void l1a_freq_req(uint32_t fn_sched); +/* request a RACH */ void l1a_rach_req(uint16_t offset, uint8_t combined, uint8_t ra); /* Primitives raw scheduling sets */ diff --git a/src/target/firmware/layer1/l23_api.c b/src/target/firmware/layer1/l23_api.c index bd990bb..b21d8f0 100644 --- a/src/target/firmware/layer1/l23_api.c +++ b/src/target/firmware/layer1/l23_api.c @@ -39,10 +39,12 @@ #include <layer1/mframe_sched.h> #include <layer1/prim.h> #include <layer1/tpu_window.h> +#include <layer1/sched_gsmtime.h> #include <abb/twl3025.h> #include <rf/trf6151.h> #include <calypso/sim.h> +#include <calypso/dsp.h> #include <l1ctl_proto.h> @@ -551,8 +553,6 @@ static void l1ctl_rx_traffic_req(struct msgb *msg) l1a_txq_msgb_enq(&l1s.tx_queue[L1S_CHAN_TRAFFIC], msg); } -void sim_apdu(uint16_t len, uint8_t *data); - static void l1ctl_sim_req(struct msgb *msg) { uint16_t len = msg->len - sizeof(struct l1ctl_hdr); diff --git a/src/target/firmware/layer1/prim_fbsb.c b/src/target/firmware/layer1/prim_fbsb.c index 06ecee2..936afbc 100644 --- a/src/target/firmware/layer1/prim_fbsb.c +++ b/src/target/firmware/layer1/prim_fbsb.c @@ -31,6 +31,7 @@ #include <debug.h> #include <memory.h> #include <byteorder.h> +#include <rffe.h> #include <osmocom/gsm/gsm_utils.h> #include <osmocom/core/msgb.h> #include <calypso/dsp_api.h> @@ -48,6 +49,7 @@ #include <layer1/mframe_sched.h> #include <layer1/tpu_window.h> #include <layer1/l23_api.h> +#include <layer1/agc.h> #include <l1ctl_proto.h> diff --git a/src/target/firmware/layer1/prim_freq.c b/src/target/firmware/layer1/prim_freq.c index 64e08b5..057caa7 100644 --- a/src/target/firmware/layer1/prim_freq.c +++ b/src/target/firmware/layer1/prim_freq.c @@ -46,6 +46,7 @@ #include <layer1/tdma_sched.h> #include <layer1/tpu_window.h> #include <layer1/l23_api.h> +#include <layer1/sched_gsmtime.h> #include <l1ctl_proto.h> diff --git a/src/target/firmware/layer1/prim_rach.c b/src/target/firmware/layer1/prim_rach.c index f0c553e..3825d7f 100644 --- a/src/target/firmware/layer1/prim_rach.c +++ b/src/target/firmware/layer1/prim_rach.c @@ -46,6 +46,7 @@ #include <layer1/tdma_sched.h> #include <layer1/tpu_window.h> #include <layer1/l23_api.h> +#include <layer1/sched_gsmtime.h> #include <l1ctl_proto.h> diff --git a/src/target/firmware/layer1/prim_rx_nb.c b/src/target/firmware/layer1/prim_rx_nb.c index 7eb4548..ade23a0 100644 --- a/src/target/firmware/layer1/prim_rx_nb.c +++ b/src/target/firmware/layer1/prim_rx_nb.c @@ -29,6 +29,7 @@ #include <debug.h> #include <memory.h> #include <byteorder.h> +#include <rffe.h> #include <osmocom/gsm/gsm_utils.h> #include <osmocom/core/msgb.h> #include <calypso/dsp_api.h> @@ -48,6 +49,7 @@ #include <layer1/l23_api.h> #include <layer1/rfch.h> #include <layer1/prim.h> +#include <layer1/agc.h> #include <l1ctl_proto.h> diff --git a/src/target/firmware/layer1/tpu_window.c b/src/target/firmware/layer1/tpu_window.c index e8762d4..c5b4d63 100644 --- a/src/target/firmware/layer1/tpu_window.c +++ b/src/target/firmware/layer1/tpu_window.c @@ -33,6 +33,7 @@ #include <layer1/sync.h> #include <layer1/tpu_window.h> +#include <layer1/rfch.h> /* all units in GSM quarter-bits (923.1ns) */ #define L1_TDMA_LENGTH_Q 5000 -- 1.7.8.rc1