diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/export/kernel.h | 6 | ||||
-rw-r--r-- | firmware/kernel.c | 5 | ||||
-rw-r--r-- | firmware/target/arm/s3c2440/gigabeat-fx/i2c-meg-fx.c | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/firmware/export/kernel.h b/firmware/export/kernel.h index 337f249dfe..e9f2bfcbaa 100644 --- a/firmware/export/kernel.h +++ b/firmware/export/kernel.h | |||
@@ -240,9 +240,9 @@ void timeout_cancel(struct timeout *tmo); | |||
240 | #define STATE_NONSIGNALED 0 | 240 | #define STATE_NONSIGNALED 0 |
241 | #define STATE_SIGNALED 1 | 241 | #define STATE_SIGNALED 1 |
242 | 242 | ||
243 | #define WAIT_TIMEDOUT (-1) | 243 | #define OBJ_WAIT_TIMEDOUT (-1) |
244 | #define WAIT_FAILED 0 | 244 | #define OBJ_WAIT_FAILED 0 |
245 | #define WAIT_SUCCEEDED 1 | 245 | #define OBJ_WAIT_SUCCEEDED 1 |
246 | 246 | ||
247 | extern void queue_init(struct event_queue *q, bool register_queue); | 247 | extern void queue_init(struct event_queue *q, bool register_queue); |
248 | extern void queue_delete(struct event_queue *q); | 248 | extern void queue_delete(struct event_queue *q); |
diff --git a/firmware/kernel.c b/firmware/kernel.c index 439aea584a..1882855985 100644 --- a/firmware/kernel.c +++ b/firmware/kernel.c | |||
@@ -1386,7 +1386,7 @@ void wakeup_init(struct wakeup *w) | |||
1386 | /* Wait for a signal blocking indefinitely or for a specified period */ | 1386 | /* Wait for a signal blocking indefinitely or for a specified period */ |
1387 | int wakeup_wait(struct wakeup *w, int timeout) | 1387 | int wakeup_wait(struct wakeup *w, int timeout) |
1388 | { | 1388 | { |
1389 | int ret = WAIT_SUCCEEDED; /* Presume success */ | 1389 | int ret = OBJ_WAIT_SUCCEEDED; /* Presume success */ |
1390 | int oldlevel = disable_irq_save(); | 1390 | int oldlevel = disable_irq_save(); |
1391 | 1391 | ||
1392 | corelock_lock(&w->cl); | 1392 | corelock_lock(&w->cl); |
@@ -1413,7 +1413,8 @@ int wakeup_wait(struct wakeup *w, int timeout) | |||
1413 | if(w->signalled == 0) | 1413 | if(w->signalled == 0) |
1414 | { | 1414 | { |
1415 | /* Timed-out or failed */ | 1415 | /* Timed-out or failed */ |
1416 | ret = (timeout != TIMEOUT_BLOCK) ? WAIT_TIMEDOUT : WAIT_FAILED; | 1416 | ret = (timeout != TIMEOUT_BLOCK) ? |
1417 | OBJ_WAIT_TIMEDOUT : OBJ_WAIT_FAILED; | ||
1417 | } | 1418 | } |
1418 | 1419 | ||
1419 | w->signalled = 0; /* Reset */ | 1420 | w->signalled = 0; /* Reset */ |
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/i2c-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/i2c-meg-fx.c index c5d23a3673..4fbbea84a1 100644 --- a/firmware/target/arm/s3c2440/gigabeat-fx/i2c-meg-fx.c +++ b/firmware/target/arm/s3c2440/gigabeat-fx/i2c-meg-fx.c | |||
@@ -62,7 +62,7 @@ void i2c_write(int addr, const unsigned char *buf, int count) | |||
62 | /* Generate START */ | 62 | /* Generate START */ |
63 | IICSTAT = I2C_MODE_MASTER | I2C_MODE_TX | I2C_START | I2C_RXTX_ENB; | 63 | IICSTAT = I2C_MODE_MASTER | I2C_MODE_TX | I2C_START | I2C_RXTX_ENB; |
64 | 64 | ||
65 | if (wakeup_wait(&i2c_wake, HZ) != WAIT_SUCCEEDED) | 65 | if (wakeup_wait(&i2c_wake, HZ) != OBJ_WAIT_SUCCEEDED) |
66 | { | 66 | { |
67 | /* Something went wrong - stop transmission */ | 67 | /* Something went wrong - stop transmission */ |
68 | int oldlevel = disable_irq_save(); | 68 | int oldlevel = disable_irq_save(); |