Merge branch 'easymotor-v3'

[fw/altos] / src / lpc / ao_beep_lpc.c

diff --git a/src/lpc/ao_beep_lpc.c b/src/lpc/ao_beep_lpc.c
index ae5caa26d88b76fee2f566f2d489776b12a6d4c1..32e108cd8a974a730f0c8a3c102abafe1b872b91 100644 (file)
--- a/src/lpc/ao_beep_lpc.c
+++ b/src/lpc/ao_beep_lpc.c
@@ -18,57 +18,64 @@
 
 #include "ao.h"
 
-#define _cat(a,b) a##b
-#define cat(a,b) _cat(a,b)
+#define _cat2(a,b) a##b
+#define cat2(a,b) _cat2(a,b)
 #define _cat4(a,b,c,d) a##b##c##d
 #define cat4(a,b,c,d) _cat4(a,b,c,d)
 #define _cat8(a,b,c,d,e,f,g,h) a##b##c##d##e##f##g##h
 #define cat8(a,b,c,d,e,f,g,h) _cat8(a,b,c,d,e,f,g,h)
 
-#define AO_TIMER_CLKCTRL       cat(LPC_SCB_SYSAHBCLKCTRL_CT32B, BEEPER_TIMER)
-#define AO_TIMER               cat(lpc_ct32b, BEEPER_TIMER)
-#define AO_TIMER_EMC           cat(LPC_CT32B_EMR_EMC, BEEPER_OUTPUT)
-#define AO_TIMER_PIO           cat4(pio, BEEPER_PORT, _, BEEPER_PIN)
-/* LPC_IOCONF_FUNC_PIO0_14_CT32B1_MAT1 */
-#define AO_TIMER_FUNC          cat8(LPC_IOCONF_FUNC_PIO, BEEPER_PORT, _, BEEPER_PIN, _CT32B, BEEPER_TIMER, _MAT, BEEPER_OUTPUT)
-#define AO_TIMER_PWM           cat(LPC_CT32B_PWMC_PWMEN, BEEPER_OUTPUT)
+#ifndef AO_LPC_BEEP_TIMER
+#define AO_LPC_BEEP_TIMER 1
+#define AO_LPC_BEEP_CHANNEL 1
+#define AO_LPC_BEEP_PORT       0
+#define AO_LPC_BEEP_PIN                14
+#endif
+
+#define AO_LPC_CT_BEEP                 cat2(lpc_ct32b, AO_LPC_BEEP_TIMER)
+#define AO_LPC_CT_BEEP_CLKCTRL cat2(LPC_SCB_SYSAHBCLKCTRL_CT32B, AO_LPC_BEEP_TIMER)
+#define AO_LPC_CT_BEEP_EMR     cat2(LPC_CT32B_EMR_EMC, AO_LPC_BEEP_CHANNEL)
+#define AO_LPC_CT_BEEP_MR      AO_LPC_BEEP_CHANNEL
+#define AO_LPC_CT_BEEP_PWMC    cat2(LPC_CT32B_PWMC_PWMEN, AO_LPC_BEEP_CHANNEL)
+#define AO_LPC_CT_BEEP_IOCONF  cat4(pio,AO_LPC_BEEP_PORT,_,AO_LPC_BEEP_PIN)
+#define AO_LPC_CT_BEEP_FUNC    cat8(LPC_IOCONF_FUNC_PIO,AO_LPC_BEEP_PORT,_,AO_LPC_BEEP_PIN,_CT32B,AO_LPC_BEEP_TIMER,_MAT,AO_LPC_BEEP_CHANNEL)
 
 void
 ao_beep(uint8_t beep)
 {
        if (beep == 0) {
-               AO_TIMER.tcr = ((0 << LPC_CT32B_TCR_CEN) |
+               AO_LPC_CT_BEEP.tcr = ((0 << LPC_CT32B_TCR_CEN) |
                                  (1 << LPC_CT32B_TCR_CRST));
-               lpc_scb.sysahbclkctrl &= ~(1UL << AO_TIMER_CLKCTRL);
+               lpc_scb.sysahbclkctrl &= ~(1UL << AO_LPC_CT_BEEP_CLKCTRL);
        } else {
-               lpc_scb.sysahbclkctrl |= (1 << AO_TIMER_CLKCTRL);
+               lpc_scb.sysahbclkctrl |= (1UL << AO_LPC_CT_BEEP_CLKCTRL);
 
                /* Set prescaler to match cc1111 clocks
                 */
-               AO_TIMER.pr = AO_LPC_SYSCLK / 750000 - 1;
+               AO_LPC_CT_BEEP.pr = AO_LPC_SYSCLK / 750000 - 1;
 
                /* Write the desired data in the match registers */
 
                /* Reset after two time units */
-               AO_TIMER.mr[0] = beep << 1;
+               AO_LPC_CT_BEEP.mr[0] = beep << 1;
 
                /* PWM width is half of that */
-               AO_TIMER.mr[BEEPER_OUTPUT] = beep;
+               AO_LPC_CT_BEEP.mr[AO_LPC_CT_BEEP_MR] = beep;
 
                /* Flip output on PWM match */
-               AO_TIMER.emr = (LPC_CT32B_EMR_EMC_TOGGLE << AO_TIMER_EMC);
+               AO_LPC_CT_BEEP.emr = (LPC_CT32B_EMR_EMC_TOGGLE << AO_LPC_CT_BEEP_EMR);
 
                /* Reset on match 0 */
-               AO_TIMER.mcr = (1 << LPC_CT32B_MCR_MR0R);
+               AO_LPC_CT_BEEP.mcr = (1 << LPC_CT32B_MCR_MR0R);
 
                /* PWM on match */
-               AO_TIMER.pwmc = (1 << AO_TIMER_PWM);
+               AO_LPC_CT_BEEP.pwmc = (1 << AO_LPC_CT_BEEP_PWMC);
 
                /* timer mode */
-               AO_TIMER.ctcr = 0;
+               AO_LPC_CT_BEEP.ctcr = 0;
 
                /* And turn the timer on */
-               AO_TIMER.tcr = ((1 << LPC_CT32B_TCR_CEN) |
+               AO_LPC_CT_BEEP.tcr = ((1 << LPC_CT32B_TCR_CEN) |
                                  (0 << LPC_CT32B_TCR_CRST));
        }
 }
@@ -84,10 +91,20 @@ ao_beep_for(uint8_t beep, AO_TICK_TYPE ticks)
 void
 ao_beep_init(void)
 {
-       lpc_ioconf.AO_TIMER_PIO = ((AO_TIMER_FUNC << LPC_IOCONF_FUNC) |
+       /* Our beeper is on c32b1_mat1
+        * which is on pin pio0_14
+        */
+
+       lpc_ioconf.AO_LPC_CT_BEEP_IOCONF = ((AO_LPC_CT_BEEP_FUNC << LPC_IOCONF_FUNC) |
                              (LPC_IOCONF_MODE_INACTIVE << LPC_IOCONF_MODE) |
                              (0 << LPC_IOCONF_HYS) |
                              (0 << LPC_IOCONF_INV) |
                              (1 << LPC_IOCONF_ADMODE) |
                              (0 << LPC_IOCONF_OD));
+
+       lpc_scb.sysahbclkctrl |= (1 << AO_LPC_CT_BEEP_CLKCTRL);
+
+       /* Disable the counter and reset the value */
+       AO_LPC_CT_BEEP.tcr = ((0 << LPC_CT32B_TCR_CEN) |
+                         (1 << LPC_CT32B_TCR_CRST));
 }