projects
/
my-code
/
arm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bullshit commit, sync for travel (to zn00H!) :)
[my-code/arm.git]
/
betty
/
interrupts.c
diff --git
a/betty/interrupts.c
b/betty/interrupts.c
index
0e0baa3
..
7d319db
100644
(file)
--- a/
betty/interrupts.c
+++ b/
betty/interrupts.c
@@
-151,20
+151,22
@@
void interrupt_ext_ir_set(u8 eint) {
}
// timer counter interrupts
}
// timer counter interrupts
-void interrupt_tc_config(u8 tcnum,u8 mode,u8 cap,u32 ps
c
) {
+void interrupt_tc_config(u8 tcnum,u8 mode,u8 cap,u32 ps
v
) {
if(tcnum>1)
return;
if(tcnum==0) {
T0TCR=0x03;
if(tcnum>1)
return;
if(tcnum==0) {
T0TCR=0x03;
+ T0TC=0;
T0CTCR=mode|(cap<<2);
T0CTCR=mode|(cap<<2);
- T0PR=ps
c
;
+ T0PR=ps
v
;
}
else {
T1TCR=0x03;
}
else {
T1TCR=0x03;
+ T1TC=0;
T1CTCR=mode|(cap<<2);
T1CTCR=mode|(cap<<2);
- T1PR=ps
c
;
+ T1PR=ps
v
;
}
}
}
}
@@
-179,15
+181,15
@@
void interrupt_tc_match_config(u8 tcnum,u8 mnum,u32 val,u8 mode) {
return;
if(tcnum==0) {
return;
if(tcnum==0) {
- T0MCR=
mode<<(3*mnum
);
- mr
ddr=&T0MR0
+ T0MCR=
(T0MCR&0x0fff)|(mode<<(3*mnum)
);
+ mr
addr=(u32 *)&T0MR0;
}
else {
}
else {
- T1MCR=
mode<<(3*mnum
);
- mr
ddr=&T1MR0
+ T1MCR=
(T1MCR&0x0fff)|(mode<<(3*mnum)
);
+ mr
addr=(u32 *)&T1MR0;
}
}
-
mraddr[mnum]
=val;
+
*((volatile u32 *)(mraddr+mnum))
=val;
}
void interrupt_tc_capt_config(u8 tcnum,u8 cnum,u8 mode) {
}
void interrupt_tc_capt_config(u8 tcnum,u8 cnum,u8 mode) {
@@
-199,9
+201,9
@@
void interrupt_tc_capt_config(u8 tcnum,u8 cnum,u8 mode) {
return;
if(tcnum==0)
return;
if(tcnum==0)
- T0CCR=
mode<<(3*cnum
);
+ T0CCR=
(T0CCR&0x0fff)|(mode<<(3*cnum)
);
else
else
- T1CCR=
mode<<(3*cnum
);
+ T1CCR=
(T1CCR&0x0fff)|(mode<<(3*cnum)
);
}
void interrupt_tc_ir_set(u8 tcnum,u8 tcmc) {
}
void interrupt_tc_ir_set(u8 tcnum,u8 tcmc) {
@@
-215,6
+217,23
@@
void interrupt_tc_ir_set(u8 tcnum,u8 tcmc) {
T1IR=tcmc;
}
T1IR=tcmc;
}
+void interrupt_tc_enable(u8 tcnum) {
+
+ if(tcnum>1)
+ return;
+
+ if(tcnum==0)
+ T0TCR=0x01;
+ else
+ T1TCR=0x01;
+}
+
+// pwm interrupts
+void interrupt_pwm_ir_set(u8 pwm_channel) {
+
+ PWMIR=(pwm_channel&0x0f)|((pwm_channel&0x70)<<4);
+}
+
/*
* the actual exception handlers (as defined in startup.s)
*/
/*
* the actual exception handlers (as defined in startup.s)
*/