aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2011-03-12 01:12:34 +0000
committerDimitri Sokolyuk <demon@dim13.org>2011-03-12 01:12:34 +0000
commit0242c6f1e0f788f61fab39cfe7227952e7c8b458 (patch)
tree4dbfdb6cd49d231ea22bed96ce1a4cf9f42141cc
parent8d9da58254aabb37d2c76414ba5a1a6e43518f45 (diff)
rename pwm into custom pwm
-rw-r--r--kernel/main.c6
-rw-r--r--kernel/rgb.c2
-rw-r--r--kernel/tasks.h2
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 *);