diff options
| author | Michael Sevakis <jethead71@rockbox.org> | 2008-04-01 03:55:02 +0000 |
|---|---|---|
| committer | Michael Sevakis <jethead71@rockbox.org> | 2008-04-01 03:55:02 +0000 |
| commit | 3c8d93e091c23a6f0db157c2a2e30f187ce5b263 (patch) | |
| tree | 2f9aff647c24a682e7f90ace7b6c6a7922c96b57 /firmware/target/arm | |
| parent | 5e0435b0d933f4780be2e946b77ee0f4f399eaad (diff) | |
| download | rockbox-3c8d93e091c23a6f0db157c2a2e30f187ce5b263.tar.gz rockbox-3c8d93e091c23a6f0db157c2a2e30f187ce5b263.zip | |
Change a #define constant that conflicts with a mingw definition. Change "WAIT_*" to "OBJ_WAIT_*".
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16906 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm')
| -rw-r--r-- | firmware/target/arm/s3c2440/gigabeat-fx/i2c-meg-fx.c | 2 |
1 files changed, 1 insertions, 1 deletions
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(); |