diff options
| author | Miika Pekkarinen <miipekk@ihme.org> | 2005-06-14 14:36:46 +0000 |
|---|---|---|
| committer | Miika Pekkarinen <miipekk@ihme.org> | 2005-06-14 14:36:46 +0000 |
| commit | ef72f996814301fc0ed9cc358f620e67a81486f7 (patch) | |
| tree | 1f866cd2931eb8fff7f0e904934d13f5d49b2a81 /firmware | |
| parent | 58c71e0e366c174fd6f71446758fe311e68f4bee (diff) | |
| download | rockbox-ef72f996814301fc0ed9cc358f620e67a81486f7.tar.gz rockbox-ef72f996814301fc0ed9cc358f620e67a81486f7.zip | |
Fixed a dead lock, file handle leak that caused wps to jam and
selected a smaller i2c timeout value.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6707 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/export/i2c-h100.h | 2 | ||||
| -rw-r--r-- | firmware/pcm_playback.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/firmware/export/i2c-h100.h b/firmware/export/i2c-h100.h index f8fd423b7e..5647b502db 100644 --- a/firmware/export/i2c-h100.h +++ b/firmware/export/i2c-h100.h | |||
| @@ -31,7 +31,7 @@ int i2c_write(int device, unsigned char *buf, int count); | |||
| 31 | void i2c_close(void); | 31 | void i2c_close(void); |
| 32 | 32 | ||
| 33 | 33 | ||
| 34 | #define MAX_LOOP 0x10000 /* TODO: select a better value */ | 34 | #define MAX_LOOP 0x100 /* TODO: select a better value */ |
| 35 | 35 | ||
| 36 | /* PLLCR control */ | 36 | /* PLLCR control */ |
| 37 | #define QSPISEL (1 << 11) /* Selects QSPI or I2C interface */ | 37 | #define QSPISEL (1 << 11) /* Selects QSPI or I2C interface */ |
diff --git a/firmware/pcm_playback.c b/firmware/pcm_playback.c index 83b7b2fc2e..d1be2a1102 100644 --- a/firmware/pcm_playback.c +++ b/firmware/pcm_playback.c | |||
| @@ -382,7 +382,7 @@ unsigned int audiobuffer_get_latency(void) | |||
| 382 | 382 | ||
| 383 | bool pcm_is_lowdata(void) | 383 | bool pcm_is_lowdata(void) |
| 384 | { | 384 | { |
| 385 | if (!pcm_is_playing()) | 385 | if (!pcm_is_playing() || pcm_paused) |
| 386 | return false; | 386 | return false; |
| 387 | 387 | ||
| 388 | if (pcmbuf_unplayed_bytes < PCM_WATERMARK) | 388 | if (pcmbuf_unplayed_bytes < PCM_WATERMARK) |