Change in simtrace2[master]: Use system include <foo.h> notation for libosmocore headers

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Harald Welte gerrit-no-reply at lists.osmocom.org
Fri Jun 29 20:30:36 UTC 2018


Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9791 )

Change subject: Use system include <foo.h> notation for libosmocore headers
......................................................................

Use system include <foo.h> notation for libosmocore headers

the curent local copies of libosmocore headers + source is a temporary
hack anyway. We should instead rely on a system-wide install of
libosmocore cross-compiled for arm-none-eabi.  But leave that as a
second (later) step beyond this patch.

Change-Id: Ia63fd842d45a2b404233b4326050e7eda0604cf0
---
M firmware/apps/cardem/main.c
M firmware/apps/triple_play/main.c
M firmware/libboard/qmod/source/board_qmod.c
M firmware/libboard/qmod/source/wwan_perst.c
M firmware/libboard/simtrace/source/board_simtrace.c
M firmware/libcommon/include/llist_irqsafe.h
M firmware/libcommon/include/usb_buf.h
M firmware/libcommon/source/card_emu.c
M firmware/libcommon/source/host_communication.c
M firmware/libcommon/source/mode_cardemu.c
M firmware/libcommon/source/pseudo_talloc.c
M firmware/libcommon/source/usb_buf.c
M firmware/libosmocore/include/osmocom/core/timer.h
M firmware/libosmocore/source/timer.c
14 files changed, 21 insertions(+), 21 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved



diff --git a/firmware/apps/cardem/main.c b/firmware/apps/cardem/main.c
index aabaa41..a80c498 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 <osmocom/core/timer.h>
 
 unsigned int g_unique_id[4];
 
diff --git a/firmware/apps/triple_play/main.c b/firmware/apps/triple_play/main.c
index 5ff3222..75fcb36 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 <osmocom/core/timer.h>
 
 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 0343895..dd6e616 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 <osmocom/core/timer.h>
 #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 aff0bb0..a6d7dd2 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 <osmocom/core/timer.h>
 
 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 e29161c..04a3249 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 <osmocom/core/timer.h>
 #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 369b026..d9c003d 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 <osmocom/core/linuxlist.h>
 #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 dd16531..7171c68 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 <osmocom/core/linuxlist.h>
+#include <osmocom/core/msgb.h>
 
 /* 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 98b08d7..7aa3fc0 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 <osmocom/core/linuxlist.h>
+#include <osmocom/core/msgb.h>
 
 
 #define NUM_SLOTS		2
diff --git a/firmware/libcommon/source/host_communication.c b/firmware/libcommon/source/host_communication.c
index 04ee9b8..75e1779 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 <osmocom/core/linuxlist.h>
+#include <osmocom/core/msgb.h>
 #include <errno.h>
 
 /***********************************************************************
diff --git a/firmware/libcommon/source/mode_cardemu.c b/firmware/libcommon/source/mode_cardemu.c
index 53b29df..7de67df 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 <osmocom/core/linuxlist.h>
+#include <osmocom/core/msgb.h>
 #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 fd5cd13..c9722ba 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 <osmocom/core/utils.h>
 
 #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 ddeb43b..848fd24 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 <osmocom/core/linuxlist.h>
+#include <osmocom/core/msgb.h>
 #include <errno.h>
 
 #define USB_ALLOC_SIZE	280
diff --git a/firmware/libosmocore/include/osmocom/core/timer.h b/firmware/libosmocore/include/osmocom/core/timer.h
index 2f62b20..6d70fff 100644
--- a/firmware/libosmocore/include/osmocom/core/timer.h
+++ b/firmware/libosmocore/include/osmocom/core/timer.h
@@ -60,8 +60,8 @@
 
 #include <stdbool.h>
 
-#include "osmocom/core/linuxlist.h"
-#include "osmocom/core/linuxrbtree.h"
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/core/linuxrbtree.h>
 
 /**
  * Timer management:
diff --git a/firmware/libosmocore/source/timer.c b/firmware/libosmocore/source/timer.c
index e045441..75c7d45 100644
--- a/firmware/libosmocore/source/timer.c
+++ b/firmware/libosmocore/source/timer.c
@@ -33,8 +33,8 @@
 
 #include <assert.h>
 #include <limits.h>
-#include "osmocom/core/linuxlist.h"
-#include "osmocom/core/timer.h"
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/core/timer.h>
 
 /* These store the amount of time that we wait until next timer expires. */
 static struct osmo_timeval nearest;

-- 
To view, visit https://gerrit.osmocom.org/9791
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: simtrace2
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia63fd842d45a2b404233b4326050e7eda0604cf0
Gerrit-Change-Number: 9791
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180629/3658e76a/attachment.htm>


More information about the gerrit-log mailing list