aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2012-11-03 16:38:57 +0000
committerDimitri Sokolyuk <demon@dim13.org>2012-11-03 16:38:57 +0000
commitb6101382eded36d9620ddb6e15e0dbda4705d087 (patch)
tree5e8d7997d06871f36287a24378c6db970db0f44a
parent9cac825d859e6f72692de4f9cf619985d2b91ceb (diff)
rename wait -> lock, signal -> unlock
-rw-r--r--kernel/adc.c4
-rw-r--r--kernel/clock.c4
-rw-r--r--kernel/kernel.c4
-rw-r--r--kernel/kernel.h4
-rw-r--r--kernel/rgb.c12
5 files changed, 14 insertions, 14 deletions
diff --git a/kernel/adc.c b/kernel/adc.c
index 551db1e..1c5d17f 100644
--- a/kernel/adc.c
+++ b/kernel/adc.c
@@ -43,9 +43,9 @@ adc(void *arg)
}
#if 0
- wait(Display);
+ lock(Display);
fprintf(stderr, "\n%8lx%8x", now(), a->value[0]);
- signal(Display);
+ unlock(Display);
#endif
sleep(0, 100000);
diff --git a/kernel/clock.c b/kernel/clock.c
index 0114192..6993f73 100644
--- a/kernel/clock.c
+++ b/kernel/clock.c
@@ -40,9 +40,9 @@ clock(void *arg)
if (h == 24) { h = 0; ++d; }
#if 0
- wait(Display);
+ lock(Display);
fprintf(stderr, "\r%4d:%.2d:%.2d:%.2d.%1d ", d, h, m, s, ds);
- signal(Display);
+ unlock(Display);
#endif
fprintf(stderr, "\r%4d:%.2d:%.2d:%.2d.%1d\n", d, h, m, s, ds);
diff --git a/kernel/kernel.c b/kernel/kernel.c
index 9574e47..29a14be 100644
--- a/kernel/kernel.c
+++ b/kernel/kernel.c
@@ -200,7 +200,7 @@ exec(void (*fun)(void *), void *args, uint8_t stack)
}
void
-wait(uint8_t chan)
+lock(uint8_t chan)
{
cli();
@@ -217,7 +217,7 @@ wait(uint8_t chan)
}
void
-signal(uint8_t chan)
+unlock(uint8_t chan)
{
struct task *tp;
diff --git a/kernel/kernel.h b/kernel/kernel.h
index 336254e..a2ddf3d 100644
--- a/kernel/kernel.h
+++ b/kernel/kernel.h
@@ -79,8 +79,8 @@ enum SysRQ { nTask, Prio };
void init(uint8_t sema);
void exec(void (*fun)(void *), void *args, uint8_t stack);
-void wait(uint8_t chan);
-void signal(uint8_t chan);
+void lock(uint8_t chan);
+void unlock(uint8_t chan);
void terminate(void);
void sleep(uint32_t sec, uint32_t usec);
diff --git a/kernel/rgb.c b/kernel/rgb.c
index 8bae4b8..4c7fee9 100644
--- a/kernel/rgb.c
+++ b/kernel/rgb.c
@@ -31,18 +31,18 @@ rgb(void *arg)
uint8_t r, g, b, v = 0;
for (;;) {
- wait(Adc);
+ lock(Adc);
v = *a->v; /* 8bit */
- signal(Adc);
+ unlock(Adc);
i = (i + 1) % 360;
hsv(&r, &g, &b, i, 255, v);
- wait(RGB);
+ lock(RGB);
a->r = r;
a->g = g;
a->b = b;
- signal(RGB);
+ unlock(RGB);
sleep(0, 234375);
}
@@ -60,9 +60,9 @@ pwm(void *arg)
PORTB &= ~_BV(a->pin);
for (;;) {
- wait(RGB);
+ lock(RGB);
t = *a->value;
- signal(RGB);
+ unlock(RGB);
/* on */
if (t) {