devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Change a #define constant that conflicts with a mingw definition. Change "WAIT_*" to "OBJ_WAIT_*".

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16906 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Sevakis 2008-04-01 03:55:02 +00:00
parent 5e0435b0d9
commit 3c8d93e091
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
firmware/export/kernel.h
View file

@ -240,9 +240,9 @@ void timeout_cancel(struct timeout *tmo);
#define STATE_NONSIGNALED 0
#define STATE_SIGNALED 1
#define WAIT_TIMEDOUT (-1)
#define WAIT_FAILED 0
#define WAIT_SUCCEEDED 1
#define OBJ_WAIT_TIMEDOUT (-1)
#define OBJ_WAIT_FAILED 0
#define OBJ_WAIT_SUCCEEDED 1
extern void queue_init(struct event_queue *q, bool register_queue);
extern void queue_delete(struct event_queue *q);

5
firmware/kernel.c
View file

@ -1386,7 +1386,7 @@ void wakeup_init(struct wakeup *w)
/* Wait for a signal blocking indefinitely or for a specified period */
int wakeup_wait(struct wakeup *w, int timeout)
{
int ret = WAIT_SUCCEEDED; /* Presume success */
int ret = OBJ_WAIT_SUCCEEDED; /* Presume success */
int oldlevel = disable_irq_save();
corelock_lock(&w->cl);
@ -1413,7 +1413,8 @@ int wakeup_wait(struct wakeup *w, int timeout)
if(w->signalled == 0)
{
/* Timed-out or failed */
ret = (timeout != TIMEOUT_BLOCK) ? WAIT_TIMEDOUT : WAIT_FAILED;
ret = (timeout != TIMEOUT_BLOCK) ?
OBJ_WAIT_TIMEDOUT : OBJ_WAIT_FAILED;
}
w->signalled = 0; /* Reset */

2
firmware/target/arm/s3c2440/gigabeat-fx/i2c-meg-fx.c
View file

@ -62,7 +62,7 @@ void i2c_write(int addr, const unsigned char *buf, int count)
/* Generate START */
IICSTAT = I2C_MODE_MASTER | I2C_MODE_TX | I2C_START | I2C_RXTX_ENB;
if (wakeup_wait(&i2c_wake, HZ) != WAIT_SUCCEEDED)
if (wakeup_wait(&i2c_wake, HZ) != OBJ_WAIT_SUCCEEDED)
{
/* Something went wrong - stop transmission */
int oldlevel = disable_irq_save();