diff --git a/source/hic_hal/freescale/kl26z/DAP_config.h b/source/hic_hal/freescale/kl26z/DAP_config.h
index d0228c39a3..bec2b53d25 100644
--- a/source/hic_hal/freescale/kl26z/DAP_config.h
+++ b/source/hic_hal/freescale/kl26z/DAP_config.h
@@ -84,11 +84,7 @@ This information includes:
 /// This configuration settings is used to optimize the communication performance with the
 /// debugger and depends on the USB peripheral. Typical vales are 64 for Full-speed USB HID or WinUSB,
 /// 1024 for High-speed USB HID and 512 for High-speed USB WinUSB.
-#ifndef HID_ENDPOINT            //HID end points currently set limits to 64
-#define DAP_PACKET_SIZE         512              ///< Specifies Packet Size in bytes.
-#else
 #define DAP_PACKET_SIZE         64              ///< Specifies Packet Size in bytes.
-#endif
 
 /// Maximum Package Buffers for Command and Response data.
 /// This configuration settings is used to optimize the communication performance with the
diff --git a/source/hic_hal/freescale/kl27z/DAP_config.h b/source/hic_hal/freescale/kl27z/DAP_config.h
index e172f48e26..a404a5e5b2 100644
--- a/source/hic_hal/freescale/kl27z/DAP_config.h
+++ b/source/hic_hal/freescale/kl27z/DAP_config.h
@@ -85,11 +85,7 @@ This information includes:
 /// This configuration settings is used to optimize the communication performance with the
 /// debugger and depends on the USB peripheral. Typical vales are 64 for Full-speed USB HID or WinUSB,
 /// 1024 for High-speed USB HID and 512 for High-speed USB WinUSB.
-#ifndef HID_ENDPOINT            //HID end points currently set limits to 64
-#define DAP_PACKET_SIZE         512              ///< Specifies Packet Size in bytes.
-#else
 #define DAP_PACKET_SIZE         64              ///< Specifies Packet Size in bytes.
-#endif
 
 /// Maximum Package Buffers for Command and Response data.
 /// This configuration settings is used to optimize the communication performance with the
diff --git a/source/hic_hal/maxim/max32620/DAP_config.h b/source/hic_hal/maxim/max32620/DAP_config.h
index 9dc1bace4f..120fd3bac1 100644
--- a/source/hic_hal/maxim/max32620/DAP_config.h
+++ b/source/hic_hal/maxim/max32620/DAP_config.h
@@ -80,11 +80,7 @@ This information includes:
 /// This configuration settings is used to optimize the communication performance with the
 /// debugger and depends on the USB peripheral. Typical vales are 64 for Full-speed USB HID or WinUSB,
 /// 1024 for High-speed USB HID and 512 for High-speed USB WinUSB.
-#ifndef HID_ENDPOINT            //HID end points currently set limits to 64
-#define DAP_PACKET_SIZE         512              ///< Specifies Packet Size in bytes.
-#else
 #define DAP_PACKET_SIZE         64              ///< Specifies Packet Size in bytes.
-#endif
 
 /// Maximum Package Buffers for Command and Response data.
 /// This configuration settings is used to optimize the communication performance with the
diff --git a/source/hic_hal/maxim/max32625/DAP_config.h b/source/hic_hal/maxim/max32625/DAP_config.h
index d48c3b6110..5b2bb3cdb2 100644
--- a/source/hic_hal/maxim/max32625/DAP_config.h
+++ b/source/hic_hal/maxim/max32625/DAP_config.h
@@ -80,11 +80,7 @@ This information includes:
 /// This configuration settings is used to optimize the communication performance with the
 /// debugger and depends on the USB peripheral. Typical vales are 64 for Full-speed USB HID or WinUSB,
 /// 1024 for High-speed USB HID and 512 for High-speed USB WinUSB.
-#ifndef HID_ENDPOINT            //HID end points currently set limits to 64
-#define DAP_PACKET_SIZE         512              ///< Specifies Packet Size in bytes.
-#else
 #define DAP_PACKET_SIZE         64              ///< Specifies Packet Size in bytes.
-#endif
 
 /// Maximum Package Buffers for Command and Response data.
 /// This configuration settings is used to optimize the communication performance with the
diff --git a/source/hic_hal/stm32/stm32f103xb/DAP_config.h b/source/hic_hal/stm32/stm32f103xb/DAP_config.h
index 34013e77d7..95af751e4a 100644
--- a/source/hic_hal/stm32/stm32f103xb/DAP_config.h
+++ b/source/hic_hal/stm32/stm32f103xb/DAP_config.h
@@ -76,11 +76,7 @@ This information includes:
 /// This configuration settings is used to optimize the communication performance with the
 /// debugger and depends on the USB peripheral. Typical vales are 64 for Full-speed USB HID or WinUSB,
 /// 1024 for High-speed USB HID and 512 for High-speed USB WinUSB.
-#ifndef HID_ENDPOINT            //HID end points currently set limits to 64
-#define DAP_PACKET_SIZE         512              ///< Specifies Packet Size in bytes.
-#else
 #define DAP_PACKET_SIZE         64              ///< Specifies Packet Size in bytes.
-#endif
 
 /// Maximum Package Buffers for Command and Response data.
 /// This configuration settings is used to optimize the communication performance with the