Skip to content
This repository was archived by the owner on Jul 6, 2019. It is now read-only.

Commit 1f77b4b

Browse files
committed
k20: Fix interrupt vector tables
It's not clear where these came from but they certainly aren't what is listed in rev. 2 of the K20 reference manual.
1 parent d1f99b7 commit 1f77b4b

File tree

2 files changed

+7
-104
lines changed

2 files changed

+7
-104
lines changed

src/zinc/hal/k20/iomem.ld

+2-26
Original file line numberDiff line numberDiff line change
@@ -4,36 +4,16 @@ PROVIDE(isr_dma_0 = isr_default_fault);
44
PROVIDE(isr_dma_1 = isr_default_fault);
55
PROVIDE(isr_dma_2 = isr_default_fault);
66
PROVIDE(isr_dma_3 = isr_default_fault);
7-
PROVIDE(isr_dma_4 = isr_default_fault);
8-
PROVIDE(isr_dma_5 = isr_default_fault);
9-
PROVIDE(isr_dma_6 = isr_default_fault);
10-
PROVIDE(isr_dma_7 = isr_default_fault);
11-
PROVIDE(isr_dma_8 = isr_default_fault);
12-
PROVIDE(isr_dma_9 = isr_default_fault);
13-
PROVIDE(isr_dma_10 = isr_default_fault);
14-
PROVIDE(isr_dma_11 = isr_default_fault);
15-
PROVIDE(isr_dma_12 = isr_default_fault);
16-
PROVIDE(isr_dma_13 = isr_default_fault);
17-
PROVIDE(isr_dma_14 = isr_default_fault);
18-
PROVIDE(isr_dma_15 = isr_default_fault);
197
PROVIDE(isr_dma_err = isr_default_fault);
208
PROVIDE(isr_flash_complete = isr_default_fault);
219
PROVIDE(isr_flash_collision = isr_default_fault);
2210
PROVIDE(isr_low_volt = isr_default_fault);
2311
PROVIDE(isr_llwu = isr_default_fault);
2412
PROVIDE(isr_wdt = isr_default_fault);
2513
PROVIDE(isr_i2c_0 = isr_default_fault);
26-
PROVIDE(isr_i2c_1 = isr_default_fault);
2714
PROVIDE(isr_spi_0 = isr_default_fault);
28-
PROVIDE(isr_spi_1 = isr_default_fault);
29-
PROVIDE(isr_can_0_msg = isr_default_fault);
30-
PROVIDE(isr_can_0_bus = isr_default_fault);
31-
PROVIDE(isr_can_0_err = isr_default_fault);
32-
PROVIDE(isr_can_0_tx = isr_default_fault);
33-
PROVIDE(isr_can_0_rx = isr_default_fault);
34-
PROVIDE(isr_can_0_wake = isr_default_fault);
35-
PROVIDE(isr_i2s_0_tx = isr_default_fault);
36-
PROVIDE(isr_i2s_0_rx = isr_default_fault);
15+
PROVIDE(isr_i2s_0 = isr_default_fault);
16+
PROVIDE(isr_i2s_1 = isr_default_fault);
3717
PROVIDE(isr_uart_0_lon = isr_default_fault);
3818
PROVIDE(isr_uart_0_stat = isr_default_fault);
3919
PROVIDE(isr_uart_0_err = isr_default_fault);
@@ -42,13 +22,10 @@ PROVIDE(isr_uart_1_err = isr_default_fault);
4222
PROVIDE(isr_uart_2_stat = isr_default_fault);
4323
PROVIDE(isr_uart_2_err = isr_default_fault);
4424
PROVIDE(isr_adc_0 = isr_default_fault);
45-
PROVIDE(isr_adc_1 = isr_default_fault);
4625
PROVIDE(isr_cmp_0 = isr_default_fault);
4726
PROVIDE(isr_cmp_1 = isr_default_fault);
48-
PROVIDE(isr_cmp_2 = isr_default_fault);
4927
PROVIDE(isr_ftm_0 = isr_default_fault);
5028
PROVIDE(isr_ftm_1 = isr_default_fault);
51-
PROVIDE(isr_ftm_2 = isr_default_fault);
5229
PROVIDE(ist_cmt = isr_default_fault);
5330
PROVIDE(isr_rtc_alarm = isr_default_fault);
5431
PROVIDE(isr_rtc_tick = isr_default_fault);
@@ -59,7 +36,6 @@ PROVIDE(isr_pit_3 = isr_default_fault);
5936
PROVIDE(isr_pdb = isr_default_fault);
6037
PROVIDE(isr_usb = isr_default_fault);
6138
PROVIDE(isr_usb_dcd = isr_default_fault);
62-
PROVIDE(isr_dac_0 = isr_default_fault);
6339
PROVIDE(isr_tsi = isr_default_fault);
6440
PROVIDE(isr_mcg = isr_default_fault);
6541
PROVIDE(isr_lptimer = isr_default_fault);

src/zinc/hal/k20/isr.rs

+5-78
Original file line numberDiff line numberDiff line change
@@ -21,36 +21,16 @@ extern {
2121
fn isr_dma_1();
2222
fn isr_dma_2();
2323
fn isr_dma_3();
24-
fn isr_dma_4();
25-
fn isr_dma_5();
26-
fn isr_dma_6();
27-
fn isr_dma_7();
28-
fn isr_dma_8();
29-
fn isr_dma_9();
30-
fn isr_dma_10();
31-
fn isr_dma_11();
32-
fn isr_dma_12();
33-
fn isr_dma_13();
34-
fn isr_dma_14();
35-
fn isr_dma_15();
3624
fn isr_dma_err();
3725
fn isr_flash_complete();
3826
fn isr_flash_collision();
3927
fn isr_low_volt();
4028
fn isr_llwu();
4129
fn isr_wdt();
4230
fn isr_i2c_0();
43-
fn isr_i2c_1();
4431
fn isr_spi_0();
45-
fn isr_spi_1();
46-
fn isr_can_0_msg();
47-
fn isr_can_0_bus();
48-
fn isr_can_0_err();
49-
fn isr_can_0_tx();
50-
fn isr_can_0_rx();
51-
fn isr_can_0_wake();
52-
fn isr_i2s_0_tx();
53-
fn isr_i2s_0_rx();
32+
fn isr_i2s_0();
33+
fn isr_i2s_1();
5434
fn isr_uart_0_lon();
5535
fn isr_uart_0_stat();
5636
fn isr_uart_0_err();
@@ -59,13 +39,10 @@ extern {
5939
fn isr_uart_2_stat();
6040
fn isr_uart_2_err();
6141
fn isr_adc_0();
62-
fn isr_adc_1();
6342
fn isr_cmp_0();
6443
fn isr_cmp_1();
65-
fn isr_cmp_2();
6644
fn isr_ftm_0();
6745
fn isr_ftm_1();
68-
fn isr_ftm_2();
6946
fn ist_cmt();
7047
fn isr_rtc_alarm();
7148
fn isr_rtc_tick();
@@ -76,7 +53,6 @@ extern {
7653
fn isr_pdb();
7754
fn isr_usb();
7855
fn isr_usb_dcd();
79-
fn isr_dac_0();
8056
fn isr_tsi();
8157
fn isr_mcg();
8258
fn isr_lptimer();
@@ -89,7 +65,7 @@ extern {
8965
}
9066

9167
#[allow(non_upper_case_globals)]
92-
const ISRCount: uint = 95;
68+
const ISRCount: uint = 46;
9369

9470
#[link_section=".isr_vector_nvic"]
9571
#[allow(non_upper_case_globals)]
@@ -99,67 +75,29 @@ pub static NVICVectors: [Option<unsafe extern fn()>, ..ISRCount] = [
9975
Some(isr_dma_1),
10076
Some(isr_dma_2),
10177
Some(isr_dma_3),
102-
Some(isr_dma_4),
103-
Some(isr_dma_5),
104-
Some(isr_dma_6),
105-
Some(isr_dma_7),
106-
Some(isr_dma_8),
107-
Some(isr_dma_9),
108-
Some(isr_dma_10),
109-
Some(isr_dma_11),
110-
Some(isr_dma_12),
111-
Some(isr_dma_13),
112-
Some(isr_dma_14),
113-
Some(isr_dma_15),
11478
Some(isr_dma_err),
11579
None,
11680
Some(isr_flash_complete),
11781
Some(isr_flash_collision),
11882
Some(isr_low_volt),
11983
Some(isr_llwu),
12084
Some(isr_wdt),
121-
None,
12285
Some(isr_i2c_0),
123-
Some(isr_i2c_1),
12486
Some(isr_spi_0),
125-
Some(isr_spi_1),
126-
None,
127-
Some(isr_can_0_msg),
128-
Some(isr_can_0_bus),
129-
Some(isr_can_0_err),
130-
Some(isr_can_0_tx),
131-
Some(isr_can_0_rx),
132-
Some(isr_can_0_wake),
133-
Some(isr_i2s_0_tx),
134-
Some(isr_i2s_0_rx),
135-
None,
136-
None,
137-
None,
138-
None,
139-
None,
140-
None,
141-
None,
87+
Some(isr_i2s_0),
88+
Some(isr_i2s_1),
14289
Some(isr_uart_0_lon),
14390
Some(isr_uart_0_stat),
14491
Some(isr_uart_0_err),
14592
Some(isr_uart_1_stat),
14693
Some(isr_uart_1_err),
14794
Some(isr_uart_2_stat),
14895
Some(isr_uart_2_err),
149-
None,
150-
None,
151-
None,
152-
None,
153-
None,
154-
None,
15596
Some(isr_adc_0),
156-
Some(isr_adc_1),
15797
Some(isr_cmp_0),
15898
Some(isr_cmp_1),
159-
Some(isr_cmp_2),
16099
Some(isr_ftm_0),
161100
Some(isr_ftm_1),
162-
Some(isr_ftm_2),
163101
Some(ist_cmt),
164102
Some(isr_rtc_alarm),
165103
Some(isr_rtc_tick),
@@ -170,24 +108,13 @@ pub static NVICVectors: [Option<unsafe extern fn()>, ..ISRCount] = [
170108
Some(isr_pdb),
171109
Some(isr_usb),
172110
Some(isr_usb_dcd),
173-
None,
174-
None,
175-
None,
176-
None,
177-
None,
178-
None,
179-
Some(isr_dac_0),
180-
None,
181111
Some(isr_tsi),
182112
Some(isr_mcg),
183113
Some(isr_lptimer),
184-
None,
185114
Some(isr_port_a),
186115
Some(isr_port_b),
187116
Some(isr_port_c),
188117
Some(isr_port_d),
189118
Some(isr_port_e),
190-
None,
191-
None,
192119
Some(isr_soft),
193120
];

0 commit comments

Comments
 (0)