diff --git a/firmware/apps/cardem/main.c b/firmware/apps/cardem/main.c index aabaa41b..a80c4986 100644 --- a/firmware/apps/cardem/main.c +++ b/firmware/apps/cardem/main.c @@ -6,7 +6,7 @@ #include "board.h" #include "simtrace.h" #include "utils.h" -#include "osmocom/core/timer.h" +#include unsigned int g_unique_id[4]; diff --git a/firmware/apps/triple_play/main.c b/firmware/apps/triple_play/main.c index 5ff32220..75fcb360 100644 --- a/firmware/apps/triple_play/main.c +++ b/firmware/apps/triple_play/main.c @@ -7,7 +7,7 @@ #include "simtrace.h" #include "utils.h" #include "req_ctx.h" -#include "osmocom/core/timer.h" +#include unsigned int g_unique_id[4]; diff --git a/firmware/libboard/qmod/source/board_qmod.c b/firmware/libboard/qmod/source/board_qmod.c index 0343895c..dd6e6166 100644 --- a/firmware/libboard/qmod/source/board_qmod.c +++ b/firmware/libboard/qmod/source/board_qmod.c @@ -9,7 +9,7 @@ #include "sim_switch.h" #include "boardver_adc.h" #include "card_pres.h" -#include "osmocom/core/timer.h" +#include #include "usb_buf.h" static const Pin pin_hubpwr_override = PIN_PRTPWR_OVERRIDE; diff --git a/firmware/libboard/qmod/source/wwan_perst.c b/firmware/libboard/qmod/source/wwan_perst.c index aff0bb04..a6d7dd2c 100644 --- a/firmware/libboard/qmod/source/wwan_perst.c +++ b/firmware/libboard/qmod/source/wwan_perst.c @@ -9,7 +9,7 @@ #include "board.h" #include "trace.h" #include "wwan_perst.h" -#include "osmocom/core/timer.h" +#include struct wwan_perst { uint8_t idx; diff --git a/firmware/libboard/simtrace/source/board_simtrace.c b/firmware/libboard/simtrace/source/board_simtrace.c index e29161c0..04a32499 100644 --- a/firmware/libboard/simtrace/source/board_simtrace.c +++ b/firmware/libboard/simtrace/source/board_simtrace.c @@ -5,7 +5,7 @@ #include "simtrace.h" #include "utils.h" #include "sim_switch.h" -#include "osmocom/core/timer.h" +#include #include "usb_buf.h" void board_exec_dbg_cmd(int ch) diff --git a/firmware/libcommon/include/llist_irqsafe.h b/firmware/libcommon/include/llist_irqsafe.h index 369b026b..d9c003d9 100644 --- a/firmware/libcommon/include/llist_irqsafe.h +++ b/firmware/libcommon/include/llist_irqsafe.h @@ -1,6 +1,6 @@ #pragma once -#include "osmocom/core/linuxlist.h" +#include #include "utils.h" static inline void llist_add_irqsafe(struct llist_head *_new, diff --git a/firmware/libcommon/include/usb_buf.h b/firmware/libcommon/include/usb_buf.h index dd16531e..7171c68b 100644 --- a/firmware/libcommon/include/usb_buf.h +++ b/firmware/libcommon/include/usb_buf.h @@ -1,7 +1,7 @@ #pragma once -#include "osmocom/core/linuxlist.h" -#include "osmocom/core/msgb.h" +#include +#include /* buffered USB endpoint (with queue of msgb) */ struct usb_buffered_ep { diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c index 98b08d7b..7aa3fc0b 100644 --- a/firmware/libcommon/source/card_emu.c +++ b/firmware/libcommon/source/card_emu.c @@ -33,8 +33,8 @@ #include "card_emu.h" #include "simtrace_prot.h" #include "usb_buf.h" -#include "osmocom/core/linuxlist.h" -#include "osmocom/core/msgb.h" +#include +#include #define NUM_SLOTS 2 diff --git a/firmware/libcommon/source/host_communication.c b/firmware/libcommon/source/host_communication.c index 04ee9b80..75e1779b 100644 --- a/firmware/libcommon/source/host_communication.c +++ b/firmware/libcommon/source/host_communication.c @@ -3,8 +3,8 @@ #include "usb_buf.h" #include "utils.h" -#include "osmocom/core/linuxlist.h" -#include "osmocom/core/msgb.h" +#include +#include #include /*********************************************************************** diff --git a/firmware/libcommon/source/mode_cardemu.c b/firmware/libcommon/source/mode_cardemu.c index 53b29df0..7de67dfc 100644 --- a/firmware/libcommon/source/mode_cardemu.c +++ b/firmware/libcommon/source/mode_cardemu.c @@ -6,8 +6,8 @@ #include "card_emu.h" #include "iso7816_fidi.h" #include "utils.h" -#include "osmocom/core/linuxlist.h" -#include "osmocom/core/msgb.h" +#include +#include #include "llist_irqsafe.h" #include "usb_buf.h" #include "simtrace_prot.h" diff --git a/firmware/libcommon/source/pseudo_talloc.c b/firmware/libcommon/source/pseudo_talloc.c index fd5cd136..c9722ba2 100644 --- a/firmware/libcommon/source/pseudo_talloc.c +++ b/firmware/libcommon/source/pseudo_talloc.c @@ -3,7 +3,7 @@ #include "talloc.h" #include "trace.h" #include "utils.h" -#include "osmocom/core/utils.h" +#include #define NUM_RCTX_SMALL 10 #define RCTX_SIZE_SMALL 348 diff --git a/firmware/libcommon/source/usb_buf.c b/firmware/libcommon/source/usb_buf.c index ddeb43bd..848fd245 100644 --- a/firmware/libcommon/source/usb_buf.c +++ b/firmware/libcommon/source/usb_buf.c @@ -2,8 +2,8 @@ #include "trace.h" #include "usb_buf.h" -#include "osmocom/core/linuxlist.h" -#include "osmocom/core/msgb.h" +#include +#include #include #define USB_ALLOC_SIZE 280 diff --git a/firmware/libosmocore/include/osmocom/core/timer.h b/firmware/libosmocore/include/osmocom/core/timer.h index 2f62b208..6d70fff4 100644 --- a/firmware/libosmocore/include/osmocom/core/timer.h +++ b/firmware/libosmocore/include/osmocom/core/timer.h @@ -60,8 +60,8 @@ struct timezone; #include -#include "osmocom/core/linuxlist.h" -#include "osmocom/core/linuxrbtree.h" +#include +#include /** * Timer management: diff --git a/firmware/libosmocore/source/timer.c b/firmware/libosmocore/source/timer.c index e0454419..75c7d459 100644 --- a/firmware/libosmocore/source/timer.c +++ b/firmware/libosmocore/source/timer.c @@ -33,8 +33,8 @@ #include #include -#include "osmocom/core/linuxlist.h" -#include "osmocom/core/timer.h" +#include +#include /* These store the amount of time that we wait until next timer expires. */ static struct osmo_timeval nearest;