<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9791">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Use system include <foo.h> notation for libosmocore headers<br><br>the curent local copies of libosmocore headers + source is a temporary<br>hack anyway. We should instead rely on a system-wide install of<br>libosmocore cross-compiled for arm-none-eabi. But leave that as a<br>second (later) step beyond this patch.<br><br>Change-Id: Ia63fd842d45a2b404233b4326050e7eda0604cf0<br>---<br>M firmware/apps/cardem/main.c<br>M firmware/apps/triple_play/main.c<br>M firmware/libboard/qmod/source/board_qmod.c<br>M firmware/libboard/qmod/source/wwan_perst.c<br>M firmware/libboard/simtrace/source/board_simtrace.c<br>M firmware/libcommon/include/llist_irqsafe.h<br>M firmware/libcommon/include/usb_buf.h<br>M firmware/libcommon/source/card_emu.c<br>M firmware/libcommon/source/host_communication.c<br>M firmware/libcommon/source/mode_cardemu.c<br>M firmware/libcommon/source/pseudo_talloc.c<br>M firmware/libcommon/source/usb_buf.c<br>M firmware/libosmocore/include/osmocom/core/timer.h<br>M firmware/libosmocore/source/timer.c<br>14 files changed, 21 insertions(+), 21 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/firmware/apps/cardem/main.c b/firmware/apps/cardem/main.c</span><br><span>index aabaa41..a80c498 100644</span><br><span>--- a/firmware/apps/cardem/main.c</span><br><span>+++ b/firmware/apps/cardem/main.c</span><br><span>@@ -6,7 +6,7 @@</span><br><span> #include "board.h"</span><br><span> #include "simtrace.h"</span><br><span> #include "utils.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "osmocom/core/timer.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/timer.h></span><br><span> </span><br><span> unsigned int g_unique_id[4];</span><br><span> </span><br><span>diff --git a/firmware/apps/triple_play/main.c b/firmware/apps/triple_play/main.c</span><br><span>index 5ff3222..75fcb36 100644</span><br><span>--- a/firmware/apps/triple_play/main.c</span><br><span>+++ b/firmware/apps/triple_play/main.c</span><br><span>@@ -7,7 +7,7 @@</span><br><span> #include "simtrace.h"</span><br><span> #include "utils.h"</span><br><span> #include "req_ctx.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "osmocom/core/timer.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/timer.h></span><br><span> </span><br><span> unsigned int g_unique_id[4];</span><br><span> </span><br><span>diff --git a/firmware/libboard/qmod/source/board_qmod.c b/firmware/libboard/qmod/source/board_qmod.c</span><br><span>index 0343895..dd6e616 100644</span><br><span>--- a/firmware/libboard/qmod/source/board_qmod.c</span><br><span>+++ b/firmware/libboard/qmod/source/board_qmod.c</span><br><span>@@ -9,7 +9,7 @@</span><br><span> #include "sim_switch.h"</span><br><span> #include "boardver_adc.h"</span><br><span> #include "card_pres.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "osmocom/core/timer.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/timer.h></span><br><span> #include "usb_buf.h"</span><br><span> </span><br><span> static const Pin pin_hubpwr_override = PIN_PRTPWR_OVERRIDE;</span><br><span>diff --git a/firmware/libboard/qmod/source/wwan_perst.c b/firmware/libboard/qmod/source/wwan_perst.c</span><br><span>index aff0bb0..a6d7dd2 100644</span><br><span>--- a/firmware/libboard/qmod/source/wwan_perst.c</span><br><span>+++ b/firmware/libboard/qmod/source/wwan_perst.c</span><br><span>@@ -9,7 +9,7 @@</span><br><span> #include "board.h"</span><br><span> #include "trace.h"</span><br><span> #include "wwan_perst.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "osmocom/core/timer.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/timer.h></span><br><span> </span><br><span> struct wwan_perst {</span><br><span> uint8_t idx;</span><br><span>diff --git a/firmware/libboard/simtrace/source/board_simtrace.c b/firmware/libboard/simtrace/source/board_simtrace.c</span><br><span>index e29161c..04a3249 100644</span><br><span>--- a/firmware/libboard/simtrace/source/board_simtrace.c</span><br><span>+++ b/firmware/libboard/simtrace/source/board_simtrace.c</span><br><span>@@ -5,7 +5,7 @@</span><br><span> #include "simtrace.h"</span><br><span> #include "utils.h"</span><br><span> #include "sim_switch.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "osmocom/core/timer.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/timer.h></span><br><span> #include "usb_buf.h"</span><br><span> </span><br><span> void board_exec_dbg_cmd(int ch)</span><br><span>diff --git a/firmware/libcommon/include/llist_irqsafe.h b/firmware/libcommon/include/llist_irqsafe.h</span><br><span>index 369b026..d9c003d 100644</span><br><span>--- a/firmware/libcommon/include/llist_irqsafe.h</span><br><span>+++ b/firmware/libcommon/include/llist_irqsafe.h</span><br><span>@@ -1,6 +1,6 @@</span><br><span> #pragma once</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include "osmocom/core/linuxlist.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/linuxlist.h></span><br><span> #include "utils.h"</span><br><span> </span><br><span> static inline void llist_add_irqsafe(struct llist_head *_new,</span><br><span>diff --git a/firmware/libcommon/include/usb_buf.h b/firmware/libcommon/include/usb_buf.h</span><br><span>index dd16531..7171c68 100644</span><br><span>--- a/firmware/libcommon/include/usb_buf.h</span><br><span>+++ b/firmware/libcommon/include/usb_buf.h</span><br><span>@@ -1,7 +1,7 @@</span><br><span> #pragma once</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include "osmocom/core/linuxlist.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "osmocom/core/msgb.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/linuxlist.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/msgb.h></span><br><span> </span><br><span> /* buffered USB endpoint (with queue of msgb) */</span><br><span> struct usb_buffered_ep {</span><br><span>diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c</span><br><span>index 98b08d7..7aa3fc0 100644</span><br><span>--- a/firmware/libcommon/source/card_emu.c</span><br><span>+++ b/firmware/libcommon/source/card_emu.c</span><br><span>@@ -33,8 +33,8 @@</span><br><span> #include "card_emu.h"</span><br><span> #include "simtrace_prot.h"</span><br><span> #include "usb_buf.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "osmocom/core/linuxlist.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "osmocom/core/msgb.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/linuxlist.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/msgb.h></span><br><span> </span><br><span> </span><br><span> #define NUM_SLOTS 2</span><br><span>diff --git a/firmware/libcommon/source/host_communication.c b/firmware/libcommon/source/host_communication.c</span><br><span>index 04ee9b8..75e1779 100644</span><br><span>--- a/firmware/libcommon/source/host_communication.c</span><br><span>+++ b/firmware/libcommon/source/host_communication.c</span><br><span>@@ -3,8 +3,8 @@</span><br><span> #include "usb_buf.h"</span><br><span> #include "utils.h"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include "osmocom/core/linuxlist.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "osmocom/core/msgb.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/linuxlist.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/msgb.h></span><br><span> #include <errno.h></span><br><span> </span><br><span> /***********************************************************************</span><br><span>diff --git a/firmware/libcommon/source/mode_cardemu.c b/firmware/libcommon/source/mode_cardemu.c</span><br><span>index 53b29df..7de67df 100644</span><br><span>--- a/firmware/libcommon/source/mode_cardemu.c</span><br><span>+++ b/firmware/libcommon/source/mode_cardemu.c</span><br><span>@@ -6,8 +6,8 @@</span><br><span> #include "card_emu.h"</span><br><span> #include "iso7816_fidi.h"</span><br><span> #include "utils.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "osmocom/core/linuxlist.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "osmocom/core/msgb.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/linuxlist.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/msgb.h></span><br><span> #include "llist_irqsafe.h"</span><br><span> #include "usb_buf.h"</span><br><span> #include "simtrace_prot.h"</span><br><span>diff --git a/firmware/libcommon/source/pseudo_talloc.c b/firmware/libcommon/source/pseudo_talloc.c</span><br><span>index fd5cd13..c9722ba 100644</span><br><span>--- a/firmware/libcommon/source/pseudo_talloc.c</span><br><span>+++ b/firmware/libcommon/source/pseudo_talloc.c</span><br><span>@@ -3,7 +3,7 @@</span><br><span> #include "talloc.h"</span><br><span> #include "trace.h"</span><br><span> #include "utils.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "osmocom/core/utils.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/utils.h></span><br><span> </span><br><span> #define NUM_RCTX_SMALL 10</span><br><span> #define RCTX_SIZE_SMALL 348</span><br><span>diff --git a/firmware/libcommon/source/usb_buf.c b/firmware/libcommon/source/usb_buf.c</span><br><span>index ddeb43b..848fd24 100644</span><br><span>--- a/firmware/libcommon/source/usb_buf.c</span><br><span>+++ b/firmware/libcommon/source/usb_buf.c</span><br><span>@@ -2,8 +2,8 @@</span><br><span> #include "trace.h"</span><br><span> #include "usb_buf.h"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include "osmocom/core/linuxlist.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "osmocom/core/msgb.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/linuxlist.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/msgb.h></span><br><span> #include <errno.h></span><br><span> </span><br><span> #define USB_ALLOC_SIZE 280</span><br><span>diff --git a/firmware/libosmocore/include/osmocom/core/timer.h b/firmware/libosmocore/include/osmocom/core/timer.h</span><br><span>index 2f62b20..6d70fff 100644</span><br><span>--- a/firmware/libosmocore/include/osmocom/core/timer.h</span><br><span>+++ b/firmware/libosmocore/include/osmocom/core/timer.h</span><br><span>@@ -60,8 +60,8 @@</span><br><span> </span><br><span> #include <stdbool.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include "osmocom/core/linuxlist.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "osmocom/core/linuxrbtree.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/linuxlist.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/linuxrbtree.h></span><br><span> </span><br><span> /**</span><br><span> * Timer management:</span><br><span>diff --git a/firmware/libosmocore/source/timer.c b/firmware/libosmocore/source/timer.c</span><br><span>index e045441..75c7d45 100644</span><br><span>--- a/firmware/libosmocore/source/timer.c</span><br><span>+++ b/firmware/libosmocore/source/timer.c</span><br><span>@@ -33,8 +33,8 @@</span><br><span> </span><br><span> #include <assert.h></span><br><span> #include <limits.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include "osmocom/core/linuxlist.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "osmocom/core/timer.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/linuxlist.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/timer.h></span><br><span> </span><br><span> /* These store the amount of time that we wait until next timer expires. */</span><br><span> static struct osmo_timeval nearest;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9791">change 9791</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/9791"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: simtrace2 </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ia63fd842d45a2b404233b4326050e7eda0604cf0 </div>
<div style="display:none"> Gerrit-Change-Number: 9791 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>