X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Flpc%2Fao_beep_lpc.c;h=ae5caa26d88b76fee2f566f2d489776b12a6d4c1;hp=67c691577928b97a29c2aa25895ff2ba4534363b;hb=f35d18ca773a109fea572ee1e7134bdc5c4bce14;hpb=6659ec1002da325588a631d9c43a7a9b9a4dbfe3

diff --git a/src/lpc/ao_beep_lpc.c b/src/lpc/ao_beep_lpc.c
index 67c69157..ae5caa26 100644
--- a/src/lpc/ao_beep_lpc.c
+++ b/src/lpc/ao_beep_lpc.c
@@ -31,6 +31,7 @@
 #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)
 
 void
 ao_beep(uint8_t beep)
@@ -52,16 +53,16 @@ ao_beep(uint8_t beep)
 		AO_TIMER.mr[0] = beep << 1;
 
 		/* PWM width is half of that */
-		AO_TIMER.mr[1] = beep;
+		AO_TIMER.mr[BEEPER_OUTPUT] = beep;
 
-		/* Flip output 1 on PWM match */
+		/* Flip output on PWM match */
 		AO_TIMER.emr = (LPC_CT32B_EMR_EMC_TOGGLE << AO_TIMER_EMC);
 
 		/* Reset on match 0 */
 		AO_TIMER.mcr = (1 << LPC_CT32B_MCR_MR0R);
 
-		/* PWM on match 1 */
-		AO_TIMER.pwmc = (1 << LPC_CT32B_PWMC_PWMEN1);
+		/* PWM on match */
+		AO_TIMER.pwmc = (1 << AO_TIMER_PWM);
 
 		/* timer mode */
 		AO_TIMER.ctcr = 0;