notaz.gp2x.de
/
teensytas.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
328c1b3
)
lower more irq priorities, split a function slowpath
author
notaz
<notasas@gmail.com>
Sat, 25 Oct 2014 22:20:39 +0000
(
01:20
+0300)
committer
notaz
<notasas@gmail.com>
Sat, 25 Oct 2014 22:20:39 +0000
(
01:20
+0300)
main.c
patch
|
blob
|
blame
|
history
diff --git
a/main.c
b/main.c
index
288f94d
..
794317b
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-96,6
+96,16
@@
static void portb_isr_fixed(void)
g.edge_cnt++;
}
g.edge_cnt++;
}
+static noinline void do_to_step(void)
+{
+ g.frame_cnt++;
+
+ g.t_o = (g.t_o + 1) & STREAM_BUF_MASK;
+ if (g.t_o == g.t_i)
+ // done
+ attachInterruptVector(IRQ_PORTB, portb_isr_fixed);
+}
+
static void portb_isr_do_to_inc(void)
{
uint32_t isfr, th;
static void portb_isr_do_to_inc(void)
{
uint32_t isfr, th;
@@
-105,14
+115,8
@@
static void portb_isr_do_to_inc(void)
th = (GPIOB_PDIR >> CORE_PIN0_BIT) & 1;
GPIOD_PDOR = g.stream_to[g.t_o][th];
th = (GPIOB_PDIR >> CORE_PIN0_BIT) & 1;
GPIOD_PDOR = g.stream_to[g.t_o][th];
- if (th) {
- g.t_o = (g.t_o + 1) & STREAM_BUF_MASK;
- if (g.t_o == g.t_i)
- // done
- attachInterruptVector(IRQ_PORTB, portb_isr_fixed);
- g.frame_cnt++;
- }
- g.edge_cnt++;
+ if (th)
+ do_to_step();
}
static void portb_isr_do_to(void)
}
static void portb_isr_do_to(void)
@@
-409,6
+413,7
@@
int main(void)
NVIC_SET_PRIORITY(IRQ_PORTB, 0);
NVIC_SET_PRIORITY(IRQ_PORTC, 16);
NVIC_SET_PRIORITY(IRQ_PORTB, 0);
NVIC_SET_PRIORITY(IRQ_PORTC, 16);
+ SCB_SHPR1 = SCB_SHPR2 = SCB_SHPR3 = 0x10101010;
pinMode( 2, OUTPUT);
pinMode(14, OUTPUT);
pinMode( 2, OUTPUT);
pinMode(14, OUTPUT);
@@
-426,9
+431,11
@@
int main(void)
printf("GPIOD PDDR, PDIR: %08x %08x\n", GPIOD_PDIR, GPIOD_PDDR);
printf("PORTB_PCR16: %08x\n", PORTB_PCR16);
printf("PORTC_PCR6: %08x\n", PORTC_PCR6);
printf("GPIOD PDDR, PDIR: %08x %08x\n", GPIOD_PDIR, GPIOD_PDDR);
printf("PORTB_PCR16: %08x\n", PORTB_PCR16);
printf("PORTC_PCR6: %08x\n", PORTC_PCR6);
+ printf("PORTD_PCR0: %08x\n", PORTD_PCR0);
asm("mrs %0, BASEPRI" : "=r"(ret));
asm("mrs %0, BASEPRI" : "=r"(ret));
- printf("BASEPRI: %d\n", ret);
+ printf("BASEPRI: %d, SHPR: %08x %08x %08x\n",
+ ret, SCB_SHPR1, SCB_SHPR2, SCB_SHPR3);
edge_cnt_last = g.edge_cnt;
edge_cnt_last = g.edge_cnt;