Merge pull request #1711 from antoinevg/antoinevg/fix-nvic-include

Add include-what-you-use mapping file for libopencm3

Author: mossmann

firmware/common/radio.c

@@ -22,7 +22,6 @@
 #include <string.h>
 
 #include <libopencm3/cm3/nvic.h>
-#include <libopencm3/lpc43xx/m4/nvic.h>
 
 #include "fixed_point.h"
 #include "hackrf_core.h"

firmware/common/usb.c

@@ -25,7 +25,6 @@
 
 #include <libopencm3/cm3/nvic.h>
 #include <libopencm3/lpc43xx/creg.h>
-#include <libopencm3/lpc43xx/m4/nvic.h>
 #include <libopencm3/lpc43xx/rgu.h>
 #include <libopencm3/lpc43xx/usb.h>
 

firmware/hackrf_usb/hackrf_usb.c

@@ -25,9 +25,8 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <libopencm3/lpc43xx/ipc.h>
-#include <libopencm3/lpc43xx/m4/nvic.h>
 #include <libopencm3/cm3/nvic.h>
+#include <libopencm3/lpc43xx/ipc.h>
 
 #include <clkin.h>
 #include <da7219.h>

firmware/hackrf_usb/usb_api_sweep.c

@@ -24,7 +24,6 @@
 #include <stddef.h>
 
 #include <libopencm3/cm3/nvic.h>
-#include <libopencm3/lpc43xx/m4/nvic.h>
 
 #include <fixed_point.h>
 #include <hackrf_core.h>

firmware/libopencm3.imp

@@ -0,0 +1,11 @@
+# include-what-you-use mapping file for libopencm3/
+#
+# Usage: include-what-you-use -Xiwyu;--mapping_file=libopencm3.imp
+
+[
+    #  allow libopencm3 to take responsibility for architecture-specific dispatch of nvic.h includes
+    { "include": ["<libopencm3/lpc43xx/m0/nvic.h>",   "private", "<libopencm3/cm3/nvic.h>", "public"] },
+    { "include": ["\"libopencm3/lpc43xx/m0/nvic.h\"", "private", "<libopencm3/cm3/nvic.h>", "public"] },
+    { "include": ["<libopencm3/lpc43xx/m4/nvic.h>",   "private", "<libopencm3/cm3/nvic.h>", "public"] },
+    { "include": ["\"libopencm3/lpc43xx/m4/nvic.h\"", "private", "<libopencm3/cm3/nvic.h>", "public"] },
+]