ARMDebugAccessPort: converted to modern exception structure

azonenberg · May 4, 2018 · 23fcab9 · 23fcab9
1 parent 6b07b0b
commit 23fcab9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/ARMDebugAccessPort.cpp b/ARMDebugAccessPort.cpp
@@ -55,8 +55,7 @@ ARMDebugAccessPort::ARMDebugAccessPort(ARMDebugPort* dp, uint8_t apnum, ARMDebug
 		{
 			throw JtagExceptionWrapper(
 				"JTAG-AP cannot be a MEM-AP",
-				"",
-				JtagException::EXCEPTION_TYPE_GIGO);
+				"");
 		}
 		break;
 
@@ -66,8 +65,7 @@ ARMDebugAccessPort::ARMDebugAccessPort(ARMDebugPort* dp, uint8_t apnum, ARMDebug
 		{
 			throw JtagExceptionWrapper(
 				"AHB bus must be a MEM-AP",
-				"",
-				JtagException::EXCEPTION_TYPE_GIGO);
+				"");
 		}
 
 		break;
@@ -78,17 +76,15 @@ ARMDebugAccessPort::ARMDebugAccessPort(ARMDebugPort* dp, uint8_t apnum, ARMDebug
 		{
 			throw JtagExceptionWrapper(
 				"APB bus must be a MEM-AP",
-				"",
-				JtagException::EXCEPTION_TYPE_GIGO);
+				"");
 		}
 
 		break;
 
 	default:
 		throw JtagExceptionWrapper(
 			"Unknown bus type",
-			"",
-			JtagException::EXCEPTION_TYPE_UNIMPLEMENTED);
+			"");
 		break;
 		}
 }

diff --git a/jtaghal.h b/jtaghal.h
@@ -130,6 +130,7 @@
 #include "XilinxDevice.h"
 
 //Vendor device classes (and support stuff)
+#include "ARMDebugPort.h"
 #include "MicrochipMicrocontroller.h"
 #include "XilinxCPLD.h"
 #include "XilinxCPLDBitstream.h"