From 2fa4a94fb9cd09372921cf9d062e4d83522ec841 Mon Sep 17 00:00:00 2001
From: chenzitai <chenzitai@139.com>
Date: Fri, 13 Jul 2018 13:45:46 +0100
Subject: [PATCH] name Interrupt vectors

(cherry picked from commit 8d15036)
---
 Firmware/Chameleon-Mini/Codec/Codec.h            | 5 +++++
 Firmware/Chameleon-Mini/Codec/Reader14443-2A.c   | 2 +-
 Firmware/Chameleon-Mini/Codec/SniffISO14443-2A.c | 6 +++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Firmware/Chameleon-Mini/Codec/Codec.h b/Firmware/Chameleon-Mini/Codec/Codec.h
index 34b8e34..09dee73 100644
--- a/Firmware/Chameleon-Mini/Codec/Codec.h
+++ b/Firmware/Chameleon-Mini/Codec/Codec.h
@@ -39,6 +39,7 @@
 #define CODEC_DEMOD_IN_EVMUX0       EVSYS_CHMUX_PORTB_PIN1_gc
 #define CODEC_DEMOD_IN_EVMUX1       EVSYS_CHMUX_PORTB_PIN2_gc
 #define CODEC_DEMOD_IN_INT0_VECT	PORTB_INT0_vect
+#define CODEC_DEMOD_IN_INT1_VECT    PORTB_INT1_vect
 #define CODEC_LOADMOD_PORT			PORTC
 #define CODEC_LOADMOD_MASK			PIN6_bm
 #define CODEC_CARRIER_IN_PORT		PORTC
@@ -58,6 +59,8 @@
 #define CODEC_TIMER_SAMPLING		TCD0
 #define CODEC_TIMER_SAMPLING_CCA_VECT	TCD0_CCA_vect
 #define CODEC_TIMER_SAMPLING_CCB_VECT	TCD0_CCB_vect
+#define CODEC_TIMER_SAMPLING_CCC_VECT   TCD0_CCC_vect
+#define CODEC_TIMER_SAMPLING_CCD_VECT   TCD0_CCD_vect
 #define CODEC_TIMER_LOADMOD       	TCE0
 #define CODEC_TIMER_LOADMOD_OVF_VECT	TCE0_OVF_vect
 #define CODEC_TIMER_LOADMOD_CCA_VECT	TCE0_CCA_vect
@@ -81,6 +84,8 @@
 #define CODEC_THRESHOLD_CALIBRATE_STEPS 16
 #define CODEC_TIMER_TIMESTAMPS		TCD1
 #define CODEC_TIMER_TIMESTAMPS_CCA_VECT	TCD1_CCA_vect
+#define CODEC_TIMER_TIMESTAMPS_CCB_VECT	TCD1_CCB_vect
+
 
 #define CODEC_BUFFER_SIZE           256
 
diff --git a/Firmware/Chameleon-Mini/Codec/Reader14443-2A.c b/Firmware/Chameleon-Mini/Codec/Reader14443-2A.c
index d9cabbe..1bea53b 100644
--- a/Firmware/Chameleon-Mini/Codec/Reader14443-2A.c
+++ b/Firmware/Chameleon-Mini/Codec/Reader14443-2A.c
@@ -179,7 +179,7 @@ INLINE void BufferToSequence(void)
         CodecBuffer[BitCount / 8] = SampleRegister >> (8 - (BitCount % 8));
 }
 // Frame Delay Time PCD to PICC ends
-ISR (TCD0_CCC_vect)
+ISR (CODEC_TIMER_SAMPLING_CCC_VECT)
 {
     CODEC_TIMER_SAMPLING.INTFLAGS = TC0_CCCIF_bm;
     CODEC_TIMER_SAMPLING.INTCTRLB = TC_CCCINTLVL_OFF_gc;
diff --git a/Firmware/Chameleon-Mini/Codec/SniffISO14443-2A.c b/Firmware/Chameleon-Mini/Codec/SniffISO14443-2A.c
index dd1e573..b7200a9 100644
--- a/Firmware/Chameleon-Mini/Codec/SniffISO14443-2A.c
+++ b/Firmware/Chameleon-Mini/Codec/SniffISO14443-2A.c
@@ -113,7 +113,7 @@ void ReaderSniffInit(void)
 
 
 // Find first pause and start sampling
-ISR(PORTB_INT1_vect) {
+ISR(CODEC_DEMOD_IN_INT1_VECT) {
     /* This is the first edge of the first modulation-pause after StartDemod.
      * Now we have time to start
      * demodulating beginning from one bit-width after this edge. */
@@ -135,7 +135,7 @@ ISR(PORTB_INT1_vect) {
 }
 
 // Sampling with timer and demod
-ISR(TCD0_CCD_vect) {
+ISR(CODEC_TIMER_SAMPLING_CCD_VECT) {
     /* This interrupt gets called twice for every bit to sample it. */
     uint8_t SamplePin = CODEC_DEMOD_IN_PORT.IN & CODEC_DEMOD_IN_MASK;
 
@@ -324,7 +324,7 @@ ISR(CODEC_TIMER_LOADMOD_CCB_VECT) // pause found
     }
 }
 // EOC of Card->Reader found
-ISR(TCD1_CCB_vect) // EOC found
+ISR(CODEC_TIMER_TIMESTAMPS_CCB_VECT) // EOC found
 {
     CODEC_TIMER_LOADMOD.INTCTRLB = 0;
     CODEC_TIMER_LOADMOD.CTRLA = TC_CLKSEL_OFF_gc;