aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2011-07-13 10:47:37 +0000
committerDimitri Sokolyuk <demon@dim13.org>2011-07-13 10:47:37 +0000
commit3a3629d5a687723d72fef3c464d4ef6e8587034e (patch)
treeccc7ce5f0c47ba4d27fc1acc598c883e4fa3f20f /kernel
parent16aec9e1c9cbcb53281bacea1193ec63c80cd75e (diff)
rename task -> exec
Diffstat (limited to 'kernel')
-rw-r--r--kernel/dmx.c18
-rw-r--r--kernel/kernel.c2
-rw-r--r--kernel/kernel.h4
-rw-r--r--kernel/remix16.c8
4 files changed, 16 insertions, 16 deletions
diff --git a/kernel/dmx.c b/kernel/dmx.c
index 54cd951..504ffaf 100644
--- a/kernel/dmx.c
+++ b/kernel/dmx.c
@@ -40,20 +40,20 @@ main()
semaphore(0, 1);
- task(heartbeat, STACK, 0); // 48
+ exec(heartbeat, STACK, 0); // 48
#if 1
- task(rgb, STACK + 16, &rgbargs);
- task(pwm, STACK, &pwmargs[0]);
- task(pwm, STACK, &pwmargs[1]);
- task(pwm, STACK, &pwmargs[2]);
+ exec(rgb, STACK + 16, &rgbargs);
+ exec(pwm, STACK, &pwmargs[0]);
+ exec(pwm, STACK, &pwmargs[1]);
+ exec(pwm, STACK, &pwmargs[2]);
#if 0
- task(cmd, STACK, &rgbargs);
+ exec(cmd, STACK, &rgbargs);
#endif
#if 1
- task(lcd, STACK, &lcdarg);
- task(clock, STACK, &clockarg);
- task(ctrl, STACK + 8, &ctrlarg);
+ exec(lcd, STACK, &lcdarg);
+ exec(clock, STACK, &clockarg);
+ exec(ctrl, STACK + 8, &ctrlarg);
#endif
#endif
diff --git a/kernel/kernel.c b/kernel/kernel.c
index 57bf9a2..fa96671 100644
--- a/kernel/kernel.c
+++ b/kernel/kernel.c
@@ -146,7 +146,7 @@ init(int stack)
}
void
-task(void (*fun)(void *), uint16_t stack, void *args)
+exec(void (*fun)(void *), uint16_t stack, void *args)
{
struct task *t;
uint8_t *sp;
diff --git a/kernel/kernel.h b/kernel/kernel.h
index e62501a..2a96b6b 100644
--- a/kernel/kernel.h
+++ b/kernel/kernel.h
@@ -61,8 +61,8 @@
#define MSEC(T) ((uint32_t)(T) * ((F_CPU / 1000) / PRESCALE))
#define USEC(T) ((uint32_t)(T) * ((F_CPU / 1000000) / PRESCALE))
-void init(int idlestack);
-void task(void (*fun)(void *), uint16_t stack, void *args);
+void init(int stack);
+void exec(void (*fun)(void *), uint16_t stack, void *args);
void semaphore(uint8_t semnbr, uint8_t initVal);
void wait(uint8_t semnbr);
diff --git a/kernel/remix16.c b/kernel/remix16.c
index c8cfbfb..22315a9 100644
--- a/kernel/remix16.c
+++ b/kernel/remix16.c
@@ -35,10 +35,10 @@ main()
semaphore(0, 1);
- task(heartbeat, STACK, MSEC(0), MSEC(750), 0);
- task(adc, STACK, MSEC(1), MSEC(60), &adcarg);
- task(ppm, STACK, MSEC(3), MSEC(20), &ppmarg);
- task(lcd, STACK, MSEC(7), MSEC(100), &lcdarg);
+ exec(heartbeat, STACK, MSEC(0), MSEC(750), 0);
+ exec(adc, STACK, MSEC(1), MSEC(60), &adcarg);
+ exec(ppm, STACK, MSEC(3), MSEC(20), &ppmarg);
+ exec(lcd, STACK, MSEC(7), MSEC(100), &lcdarg);
for (;;);