diff options
| author | Joel Bodenmann <joel@unormal.org> | 2014-05-04 17:55:17 +0200 |
|---|---|---|
| committer | Joel Bodenmann <joel@unormal.org> | 2014-05-04 17:55:17 +0200 |
| commit | 7e791910246677f9e09c0957f1805409e790f57e (patch) | |
| tree | a3e31469a99323eb6e14f928c32fd070bffb1324 /drivers | |
| parent | 1a0d1f1d1097ade825cdabbd693ebf7f48dcee77 (diff) | |
| parent | 9698f0a74319fa4a843783a1aa72dfca2c3fc90f (diff) | |
| download | uGFX-7e791910246677f9e09c0957f1805409e790f57e.tar.gz uGFX-7e791910246677f9e09c0957f1805409e790f57e.tar.bz2 uGFX-7e791910246677f9e09c0957f1805409e790f57e.zip | |
Merge branch 'master' into freertos
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gaudio/vs1053/driver.mk | 2 | ||||
| -rw-r--r-- | drivers/gaudio/vs1053/gaudio_play_lld.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gaudio/vs1053/driver.mk b/drivers/gaudio/vs1053/driver.mk index d0419c80..54ad07de 100644 --- a/drivers/gaudio/vs1053/driver.mk +++ b/drivers/gaudio/vs1053/driver.mk @@ -4,4 +4,4 @@ GFXSRC += $(GFXLIB)/drivers/gaudio/vs1053/gaudio_play_lld.c # Required include directories GFXINC += $(GFXLIB)/drivers/gaudio/vs1053 -GFXDEFS += -DGFX_USE_GTIMER=TRUE +GFXDEFS += -DGFX_USE_GTIMER=GFX_USE_GAUDIO diff --git a/drivers/gaudio/vs1053/gaudio_play_lld.c b/drivers/gaudio/vs1053/gaudio_play_lld.c index 9e77e383..fc62fea2 100644 --- a/drivers/gaudio/vs1053/gaudio_play_lld.c +++ b/drivers/gaudio/vs1053/gaudio_play_lld.c @@ -188,7 +188,7 @@ static void FeedData(void *param) { (void) param; // While there is data space - while (!board_dreq()) { + while (board_dreq()) { // Send up to 32 bytes len = playlen; |