Revised code to V2.0 + Fast Port Manipulation

Author: sds1979v

src/DAP.c

@@ -1,5 +1,7 @@
-/* CMSIS-DAP Interface Firmware
+/*
  * Copyright (c) 2013-2017 ARM Limited. All rights reserved.
+ * Copyright 2019, Cypress Semiconductor Corporation 
+ * or a subsidiary of Cypress Semiconductor Corporation.
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -31,9 +33,7 @@
 #endif
 #include "DAP_config.h"
 #include "DAP.h"
-/* #include "info.h"
-#include "dap_strings.h" */
-
+#include "dap_strings.h"
 
 #if (DAP_PACKET_SIZE < 64U)
 #error "Minimum Packet Size is 64!"

src/DAP.h

@@ -1,5 +1,7 @@
-/* CMSIS-DAP Interface Firmware
- * Copyright (c) 2013-2017 ARM Limited. All rights reserved.
+/*
+ * Copyright (c) 2013-2019 ARM Limited. All rights reserved.
+ * Copyright 2019, Cypress Semiconductor Corporation 
+ * or a subsidiary of Cypress Semiconductor Corporation.
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -17,7 +19,7 @@
  *
  * ----------------------------------------------------------------------
  *
- * $Date:        1. December 2017
+ * $Date:        26. November 2019
  * $Revision:    V2.0.0
  *
  * Project:      CMSIS-DAP Include
@@ -101,6 +103,11 @@
 #define ID_DAP_Vendor30                 0x9EU
 #define ID_DAP_Vendor31                 0x9FU
 
+// DAP Extended range of Vendor Command IDs
+
+#define ID_DAP_VendorExFirst            0xA0U
+#define ID_DAP_VendorExLast             0xFEU
+
 #define ID_DAP_Invalid                  0xFFU
 
 // DAP Status Code
@@ -194,7 +201,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
-//#include "cmsis_compiler.h"
+#include "cmsis_compiler.h"
 
 // DAP Data structure
 typedef struct {
@@ -233,6 +240,11 @@ extern          DAP_Data_t DAP_Data;            // DAP Data
 extern volatile uint8_t    DAP_TransferAbort;   // Transfer Abort Flag
 
 
+#ifdef  __cplusplus
+extern "C"
+{
+#endif
+
 // Functions
 extern void     SWJ_Sequence    (uint32_t count, const uint8_t *data);
 extern void     SWD_Sequence    (uint32_t info,  const uint8_t *swdo, uint8_t *swdi);
@@ -279,28 +291,42 @@ extern void     DAP_Setup (void);
 #ifndef DELAY_SLOW_CYCLES
 #define DELAY_SLOW_CYCLES       3U      // Number of cycles for one iteration
 #endif
+#if defined(__CC_ARM)
 __STATIC_FORCEINLINE void PIN_DELAY_SLOW (uint32_t delay) {
-  uint32_t count;
-
-  count = delay;
+  uint32_t count = delay;
   while (--count);
 }
+#else
+__STATIC_FORCEINLINE void PIN_DELAY_SLOW (uint32_t delay) {
+  __ASM volatile (
+  ".syntax unified\n"
+  "0:\n\t"
+    "subs %0,%0,#1\n\t"
+    "bne  0b\n"
+  : "+l" (delay) : : "cc"
+  );
+}
+#endif
 
 // Fixed delay for fast clock generation
 #ifndef DELAY_FAST_CYCLES
 #define DELAY_FAST_CYCLES       0U      // Number of cycles: 0..3
 #endif
 __STATIC_FORCEINLINE void PIN_DELAY_FAST (void) {
 #if (DELAY_FAST_CYCLES >= 1U)
-  __nop();
+  __NOP();
 #endif
 #if (DELAY_FAST_CYCLES >= 2U)
-  __nop();
+  __NOP();
 #endif
 #if (DELAY_FAST_CYCLES >= 3U)
-  __nop();
+  __NOP();
 #endif
 }
 
+#ifdef  __cplusplus
+}
+#endif
+
 
 #endif  /* __DAP_H__ */