diff options
| author | Harald Welte <laforge@gnumonks.org> | 2017-07-12 23:12:54 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2017-07-12 23:26:26 +0200 |
| commit | c8d1ad36eb2e096771d9d29c9bcd54720a798d6c (patch) | |
| tree | e1b70dca77c45ed80b61dba02e4b936b8238cbd2 | |
| parent | 5abc25c85236af77a807b8e180fff20924c1362d (diff) | |
VIRT-PHY: Fix all compiler warnings on gcc-6.3.0
Change-Id: I95b93ec907fbfd180a0f2ac681dd63791ede24db
| -rw-r--r-- | src/host/virt_phy/include/virtphy/logging.h | 2 | ||||
| -rw-r--r-- | src/host/virt_phy/src/l1ctl_sock.c | 2 | ||||
| -rw-r--r-- | src/host/virt_phy/src/logging.c | 4 | ||||
| -rw-r--r-- | src/host/virt_phy/src/virt_prim_data.c | 1 | ||||
| -rw-r--r-- | src/host/virt_phy/src/virt_prim_rach.c | 1 | ||||
| -rw-r--r-- | src/host/virt_phy/src/virt_prim_traffic.c | 1 |
6 files changed, 7 insertions, 4 deletions
diff --git a/src/host/virt_phy/include/virtphy/logging.h b/src/host/virt_phy/include/virtphy/logging.h index 87f12f77..6ca25253 100644 --- a/src/host/virt_phy/include/virtphy/logging.h +++ b/src/host/virt_phy/include/virtphy/logging.h @@ -8,4 +8,4 @@ extern const struct log_info ms_log_info; int ms_log_init(char *cat_mask); -char *getL1ctlPrimName(uint8_t type); +const char *getL1ctlPrimName(uint8_t type); diff --git a/src/host/virt_phy/src/l1ctl_sock.c b/src/host/virt_phy/src/l1ctl_sock.c index e136aa88..2e16bfad 100644 --- a/src/host/virt_phy/src/l1ctl_sock.c +++ b/src/host/virt_phy/src/l1ctl_sock.c @@ -86,7 +86,7 @@ static int l1ctl_sock_data_cb(struct osmo_fd *ofd, unsigned int what) if (rc == len) { msgb_put(msg, rc); l1h = (void *) msgb_data(msg); - msg->l1h = l1h; + msg->l1h = (void *) l1h; lsi->recv_cb(lsi, msg); return 0; } diff --git a/src/host/virt_phy/src/logging.c b/src/host/virt_phy/src/logging.c index 097bf351..7801beca 100644 --- a/src/host/virt_phy/src/logging.c +++ b/src/host/virt_phy/src/logging.c @@ -25,7 +25,7 @@ #include <osmocom/core/application.h> #include <virtphy/logging.h> -const char* l1ctlPrimNames[] = { +static const char* l1ctlPrimNames[] = { "_L1CTL_NONE", "L1CTL_FBSB_REQ", "L1CTL_FBSB_CONF", @@ -105,7 +105,7 @@ int ms_log_init(char *cat_mask) return 0; } -char *getL1ctlPrimName(uint8_t type) +const char *getL1ctlPrimName(uint8_t type) { return l1ctlPrimNames[type]; } diff --git a/src/host/virt_phy/src/virt_prim_data.c b/src/host/virt_phy/src/virt_prim_data.c index 226078c7..8b65d6da 100644 --- a/src/host/virt_phy/src/virt_prim_data.c +++ b/src/host/virt_phy/src/virt_prim_data.c @@ -27,6 +27,7 @@ #include <string.h> #include <stdlib.h> +#include <osmocom/gsm/rsl.h> #include <osmocom/gsm/gsm_utils.h> #include <osmocom/gsm/protocol/gsm_08_58.h> #include <osmocom/core/msgb.h> diff --git a/src/host/virt_phy/src/virt_prim_rach.c b/src/host/virt_phy/src/virt_prim_rach.c index 0bda7e94..1642ac63 100644 --- a/src/host/virt_phy/src/virt_prim_rach.c +++ b/src/host/virt_phy/src/virt_prim_rach.c @@ -27,6 +27,7 @@ #include <string.h> #include <stdlib.h> +#include <osmocom/gsm/rsl.h> #include <osmocom/gsm/gsm_utils.h> #include <osmocom/gsm/protocol/gsm_08_58.h> #include <osmocom/core/msgb.h> diff --git a/src/host/virt_phy/src/virt_prim_traffic.c b/src/host/virt_phy/src/virt_prim_traffic.c index 0e021533..50e68579 100644 --- a/src/host/virt_phy/src/virt_prim_traffic.c +++ b/src/host/virt_phy/src/virt_prim_traffic.c @@ -27,6 +27,7 @@ #include <string.h> #include <stdlib.h> +#include <osmocom/gsm/rsl.h> #include <osmocom/gsm/gsm_utils.h> #include <osmocom/gsm/protocol/gsm_08_58.h> #include <osmocom/core/msgb.h> |