You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by GitBox <gi...@apache.org> on 2018/09/21 14:04:21 UTC

[GitHub] andrzej-kaczmarek closed pull request #1415: hw/mcu/nordic: Remove unecessary includes

andrzej-kaczmarek closed pull request #1415: hw/mcu/nordic: Remove unecessary includes
URL: https://github.com/apache/mynewt-core/pull/1415
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/hw/mcu/nordic/nrf52xxx-compat/include/mcu/cmsis_nvic.h b/hw/mcu/nordic/nrf52xxx-compat/include/mcu/cmsis_nvic.h
index 7f0a9f1aa8..11a812d337 100644
--- a/hw/mcu/nordic/nrf52xxx-compat/include/mcu/cmsis_nvic.h
+++ b/hw/mcu/nordic/nrf52xxx-compat/include/mcu/cmsis_nvic.h
@@ -8,13 +8,11 @@
 #define MBED_CMSIS_NVIC_H
 
 #include <stdint.h>
-#include <bsp/bsp.h>
+#include "nrf.h"
 
 #define NVIC_NUM_VECTORS      (16 + 38)   // CORE + MCU Peripherals
 #define NVIC_USER_IRQ_OFFSET  16
 
-#include "nrf.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/hw/mcu/nordic/nrf52xxx/include/mcu/cmsis_nvic.h b/hw/mcu/nordic/nrf52xxx/include/mcu/cmsis_nvic.h
index 7f0a9f1aa8..11a812d337 100644
--- a/hw/mcu/nordic/nrf52xxx/include/mcu/cmsis_nvic.h
+++ b/hw/mcu/nordic/nrf52xxx/include/mcu/cmsis_nvic.h
@@ -8,13 +8,11 @@
 #define MBED_CMSIS_NVIC_H
 
 #include <stdint.h>
-#include <bsp/bsp.h>
+#include "nrf.h"
 
 #define NVIC_NUM_VECTORS      (16 + 38)   // CORE + MCU Peripherals
 #define NVIC_USER_IRQ_OFFSET  16
 
-#include "nrf.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services