From 0242c6f1e0f788f61fab39cfe7227952e7c8b458 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Sat, 12 Mar 2011 01:12:34 +0000 Subject: rename pwm into custom pwm --- kernel/main.c | 6 +++--- kernel/rgb.c | 2 +- kernel/tasks.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/kernel/main.c b/kernel/main.c index 736975f..bbcae3c 100644 --- a/kernel/main.c +++ b/kernel/main.c @@ -46,9 +46,9 @@ main() task(heartbeat, STACK, SEC(0), MSEC(10), 0); task(rgb, STACK, SEC(0), MSEC(10), &rgbargs[0]); - task(pwm, STACK, SEC(0), MSEC(10), &pwmargs[0]); - task(pwm, STACK, SEC(0), MSEC(10), &pwmargs[1]); - task(pwm, STACK, SEC(0), MSEC(10), &pwmargs[2]); + task(cpwm, STACK, SEC(0), MSEC(10), &pwmargs[0]); + task(cpwm, STACK, SEC(0), MSEC(10), &pwmargs[1]); + task(cpwm, STACK, SEC(0), MSEC(10), &pwmargs[2]); task(lcd, STACK, MSEC(40), SEC(1), 0); task(adc, STACK, MSEC(0), MSEC(20), &adcarg[0]); diff --git a/kernel/rgb.c b/kernel/rgb.c index c1aefde..23e3b9f 100644 --- a/kernel/rgb.c +++ b/kernel/rgb.c @@ -53,7 +53,7 @@ rgb(void *arg) } void -pwm(void *arg) +cpwm(void *arg) { #define SCALE 4 struct pwmarg *a = (struct pwmarg *)arg; diff --git a/kernel/tasks.h b/kernel/tasks.h index ea7a20e..4137402 100644 --- a/kernel/tasks.h +++ b/kernel/tasks.h @@ -40,7 +40,7 @@ void init_uart(void); void heartbeat(void *); void rgb(void *); -void pwm(void *); +void cpwm(void *); void lcd(void *); void adc(void *); -- cgit v1.2.3