[M] Change in osmocom-bb[master]: modem: clean up #includes (using include-what-you-use)
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31655 )
Change subject: modem: clean up #includes (using include-what-you-use) ......................................................................
modem: clean up #includes (using include-what-you-use)
Change-Id: I728f3eea1590f46bef6e0eb4beb9714f6c9a1614 --- M src/host/layer23/src/modem/app_modem.c M src/host/layer23/src/modem/llc.c M src/host/layer23/src/modem/rlcmac.c M src/host/layer23/src/modem/sndcp.c M src/host/layer23/src/modem/vty.c 5 files changed, 39 insertions(+), 25 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/55/31655/1
diff --git a/src/host/layer23/src/modem/app_modem.c b/src/host/layer23/src/modem/app_modem.c index 6fe7c8b..8fa78c1 100644 --- a/src/host/layer23/src/modem/app_modem.c +++ b/src/host/layer23/src/modem/app_modem.c @@ -20,20 +20,27 @@
#include <stdbool.h> #include <stdint.h> +#include <string.h> #include <errno.h> #include <stdio.h>
+#include <sys/socket.h> +#include <netinet/in.h> #include <netinet/ip.h> #include <netinet/ip6.h>
#include <osmocom/core/msgb.h> +#include <osmocom/core/utils.h> #include <osmocom/core/signal.h> #include <osmocom/core/application.h> #include <osmocom/core/socket.h> #include <osmocom/core/tun.h> +#include <osmocom/gsm/gsm_utils.h> +#include <osmocom/gsm/lapdm.h> #include <osmocom/vty/vty.h>
#include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/settings.h> #include <osmocom/bb/common/ms.h> #include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/l1ctl.h> diff --git a/src/host/layer23/src/modem/llc.c b/src/host/layer23/src/modem/llc.c index 4bb0684..8d9d5bd 100644 --- a/src/host/layer23/src/modem/llc.c +++ b/src/host/layer23/src/modem/llc.c @@ -20,25 +20,23 @@
#include <errno.h> #include <stdint.h> +#include <string.h> #include <stdbool.h> -#include <inttypes.h>
+#include <osmocom/core/prim.h> #include <osmocom/core/msgb.h> -#include <osmocom/core/linuxlist.h> -#include <osmocom/core/timer.h> +#include <osmocom/core/utils.h> #include <osmocom/core/talloc.h> -#include <osmocom/core/rate_ctr.h> -#include <osmocom/crypt/kdf.h> -#include <osmocom/gprs/gprs_bssgp.h> -#include <osmocom/gsm/gsm_utils.h> +#include <osmocom/core/logging.h> + +#include <osmocom/gprs/gprs_msgb.h> #include <osmocom/gprs/llc/llc_prim.h> #include <osmocom/gprs/llc/llc.h> #include <osmocom/gprs/rlcmac/rlcmac_prim.h> #include <osmocom/gprs/sndcp/sndcp_prim.h>
-#include <osmocom/bb/common/logging.h> -#include <osmocom/bb/common/apn.h> #include <osmocom/bb/common/ms.h> +#include <osmocom/bb/common/logging.h> #include <osmocom/bb/modem/llc.h>
static int modem_llc_handle_ll_gmm(struct osmo_gprs_llc_prim *llc_prim) diff --git a/src/host/layer23/src/modem/rlcmac.c b/src/host/layer23/src/modem/rlcmac.c index 83dcd6c..7cd1ba4 100644 --- a/src/host/layer23/src/modem/rlcmac.c +++ b/src/host/layer23/src/modem/rlcmac.c @@ -21,22 +21,20 @@ #include <errno.h> #include <stdint.h> #include <stdbool.h> -#include <inttypes.h>
#include <osmocom/core/msgb.h> -#include <osmocom/core/linuxlist.h> -#include <osmocom/core/timer.h> +#include <osmocom/core/bits.h> +#include <osmocom/core/prim.h> +#include <osmocom/core/utils.h> #include <osmocom/core/talloc.h> -#include <osmocom/core/rate_ctr.h> -#include <osmocom/crypt/kdf.h> -#include <osmocom/gprs/gprs_bssgp.h> +#include <osmocom/core/logging.h> + #include <osmocom/gsm/gsm_utils.h> #include <osmocom/gprs/rlcmac/rlcmac_prim.h> #include <osmocom/gprs/rlcmac/rlcmac.h> #include <osmocom/gprs/llc/llc_prim.h>
#include <osmocom/bb/common/logging.h> -#include <osmocom/bb/common/apn.h> #include <osmocom/bb/common/ms.h> #include <osmocom/bb/modem/rlcmac.h>
diff --git a/src/host/layer23/src/modem/sndcp.c b/src/host/layer23/src/modem/sndcp.c index eba8d11..ee5380f 100644 --- a/src/host/layer23/src/modem/sndcp.c +++ b/src/host/layer23/src/modem/sndcp.c @@ -19,18 +19,16 @@ */
#include <stdbool.h> +#include <string.h> #include <stdint.h> #include <errno.h> #include <stdio.h>
-#include <netinet/ip.h> -#include <netinet/ip6.h> - #include <osmocom/core/msgb.h> +#include <osmocom/core/prim.h> +#include <osmocom/core/utils.h> #include <osmocom/core/linuxlist.h> -#include <osmocom/core/timer.h> #include <osmocom/core/talloc.h> -#include <osmocom/core/endian.h> #include <osmocom/core/tun.h>
#include <osmocom/gprs/llc/llc.h> @@ -38,6 +36,7 @@ #include <osmocom/gprs/sndcp/sndcp_prim.h> #include <osmocom/gprs/sndcp/sndcp.h>
+#include <osmocom/bb/common/settings.h> #include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/apn.h> #include <osmocom/bb/common/ms.h> diff --git a/src/host/layer23/src/modem/vty.c b/src/host/layer23/src/modem/vty.c index bd8afd8..e462a23 100644 --- a/src/host/layer23/src/modem/vty.c +++ b/src/host/layer23/src/modem/vty.c @@ -15,15 +15,18 @@ * */
-#include <string.h> #include <stdlib.h> -#include <stdarg.h> -#include <unistd.h> -#include <sys/types.h> +#include <stdint.h> +#include <stdbool.h> + +#include <osmocom/core/utils.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/linuxlist.h>
#include <osmocom/vty/vty.h> #include <osmocom/vty/command.h>
+#include <osmocom/bb/common/settings.h> #include <osmocom/bb/common/vty.h> #include <osmocom/bb/common/apn.h> #include <osmocom/bb/common/ms.h>
-
fixeria