Merge pull request #688 from flit/cleanup/misc2

More misc cleanup

Author: flit

source/daplink/bootloader/main.h

@@ -3,7 +3,7 @@
  * @brief
  *
  * DAPLink Interface Firmware
- * Copyright (c) 2009-2016, ARM Limited, All Rights Reserved
+ * Copyright (c) 2009-2019, ARM Limited, All Rights Reserved
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -22,11 +22,7 @@
 #ifndef MAIN_H
 #define MAIN_H
 
-#include "stdint.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <stdint.h>
 
 /**
  *  @enum main_usb_busy_t
@@ -59,6 +55,10 @@ typedef enum {
     MAIN_LED_FLASH_PERMANENT
 } main_led_state_t;
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  *  Allows other parts of the program to request the device to eject physical media
  *  @param  none

source/daplink/circ_buf.c

@@ -22,7 +22,6 @@
 #include "circ_buf.h"
 
 #include "cortex_m.h"
-#include "macro.h"
 #include "util.h"
 
 void circ_buf_init(circ_buf_t *circ_buf, uint8_t *buffer, uint32_t size)
@@ -74,7 +73,7 @@ uint8_t circ_buf_pop(circ_buf_t *circ_buf)
     }
 
     cortex_int_restore(state);
-    
+
     return data;
 }
 
@@ -94,7 +93,7 @@ uint32_t circ_buf_count_used(circ_buf_t *circ_buf)
     cortex_int_restore(state);
     return cnt;
 }
-    
+
 uint32_t circ_buf_count_free(circ_buf_t *circ_buf)
 {
     uint32_t cnt;

source/daplink/circ_buf.h

@@ -22,8 +22,8 @@
 #ifndef CIRC_BUF_H
 #define CIRC_BUF_H
 
-#include "stdbool.h"
-#include "stdint.h"
+#include <stdbool.h>
+#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {

source/daplink/cortex_m.h

@@ -22,8 +22,8 @@
 #ifndef CORTEX_M_H
 #define CORTEX_M_H
 
-#include "stdint.h"
-#include "stdbool.h"
+#include <stdint.h>
+#include <stdbool.h>
 
 #include "IO_Config.h"
 

source/daplink/crc.h

@@ -21,7 +21,7 @@
 #ifndef _crc_h
 #define _crc_h
 
-#include "stdint.h"
+#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {

source/daplink/daplink.h

@@ -22,8 +22,8 @@
 #ifndef DAPLINK_H
 #define DAPLINK_H
 
-#include "stdbool.h"
-#include "stdint.h"
+#include <stdbool.h>
+#include <stdint.h>
 
 #include "daplink_addr.h"
 #include "compiler.h"

source/daplink/daplink_debug.h

@@ -22,13 +22,13 @@
 #ifndef DAPLINK_DEBUG_H
 #define DAPLINK_DEBUG_H
 
-#include "stdarg.h"
-#include "stdio.h"
-#include "string.h"
-#include "stdint.h"
+#include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdint.h>
 #include "cmsis_os2.h"
 #include "rl_usb.h"
-#include "macro.h"
+#include "util.h"
 
 #ifdef __cplusplus
 extern "C" {

source/daplink/drag-n-drop/file_stream.c

@@ -19,11 +19,10 @@
  * limitations under the License.
  */
 
-#include "string.h"
+#include <string.h>
 
 #include "file_stream.h"
 #include "util.h"
-#include "macro.h"
 #include "intelhex.h"
 #include "flash_decoder.h"
 #include "error.h"
@@ -80,7 +79,7 @@ stream_t stream[] = {
     {detect_bin, open_bin, write_bin, close_bin},   // STREAM_TYPE_BIN
     {detect_hex, open_hex, write_hex, close_hex},   // STREAM_TYPE_HEX
 };
-COMPILER_ASSERT(ELEMENTS_IN_ARRAY(stream) == STREAM_TYPE_COUNT);
+COMPILER_ASSERT(ARRAY_SIZE(stream) == STREAM_TYPE_COUNT);
 // STREAM_TYPE_NONE must not be included in count
 COMPILER_ASSERT(STREAM_TYPE_NONE > STREAM_TYPE_COUNT);
 

source/daplink/drag-n-drop/file_stream.h

@@ -22,7 +22,7 @@
 #ifndef FILE_STREAM_H
 #define FILE_STREAM_H
 
-#include "stdint.h"
+#include <stdint.h>
 
 #include "virtual_fs.h"
 #include "error.h"

source/daplink/drag-n-drop/flash_decoder.c

@@ -19,11 +19,10 @@
  * limitations under the License.
  */
 
-#include "string.h"
+#include <string.h>
 
 #include "flash_decoder.h"
 #include "util.h"
-#include "macro.h"
 #include "daplink.h"
 #include "flash_manager.h"
 #include "target_config.h"  // for target_device
@@ -353,7 +352,7 @@ static bool flash_decoder_is_at_end(uint32_t addr, const uint8_t *data, uint32_t
         case FLASH_DECODER_TYPE_INTERFACE:
             end_addr = DAPLINK_ROM_IF_START + DAPLINK_ROM_IF_SIZE;
             break;
-        
+
         case FLASH_DECODER_TYPE_TARGET:
             //only if we are sure it is a bin for the target; without check unordered hex files will cause to terminate flashing
             if (flash_type_target_bin && g_board_info.target_cfg) {
@@ -367,7 +366,7 @@ static bool flash_decoder_is_at_end(uint32_t addr, const uint8_t *data, uint32_t
                 if(end_addr == 0){ //invalid end_addr
                     return false;
                 }
-                
+
             }
             else {
                 return false;