diff options
author | Alexander Levin <al.le@rockbox.org> | 2011-01-23 21:57:23 +0000 |
---|---|---|
committer | Alexander Levin <al.le@rockbox.org> | 2011-01-23 21:57:23 +0000 |
commit | eb9ca72388ae2711adced9771a57b94d3a9caf7b (patch) | |
tree | bb0a8524692acb68cc6bcfa54e3d74fc0e40a8b2 | |
parent | fb2d6a7a3a15f33b06b8efc3c0e5d93ae12cfbc2 (diff) | |
download | rockbox-eb9ca72388ae2711adced9771a57b94d3a9caf7b.tar.gz rockbox-eb9ca72388ae2711adced9771a57b94d3a9caf7b.zip |
Fix r29123: the variable should be initialized every time in the loop
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29124 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/drivers/lcd-bitmap-common.c | 3 | ||||
-rw-r--r-- | firmware/drivers/lcd-charcell.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/firmware/drivers/lcd-bitmap-common.c b/firmware/drivers/lcd-bitmap-common.c index 1a504c6f40..364fb3c527 100644 --- a/firmware/drivers/lcd-bitmap-common.c +++ b/firmware/drivers/lcd-bitmap-common.c | |||
@@ -435,7 +435,7 @@ void LCDFN(scroll_fn)(void) | |||
435 | int index; | 435 | int index; |
436 | int xpos, ypos; | 436 | int xpos, ypos; |
437 | struct viewport* old_vp = current_vp; | 437 | struct viewport* old_vp = current_vp; |
438 | bool makedelay = false; | 438 | bool makedelay; |
439 | 439 | ||
440 | for ( index = 0; index < LCDFN(scroll_info).lines; index++ ) { | 440 | for ( index = 0; index < LCDFN(scroll_info).lines; index++ ) { |
441 | s = &LCDFN(scroll_info).scroll[index]; | 441 | s = &LCDFN(scroll_info).scroll[index]; |
@@ -455,6 +455,7 @@ void LCDFN(scroll_fn)(void) | |||
455 | xpos = s->startx; | 455 | xpos = s->startx; |
456 | ypos = s->y * pf->height + s->y_offset; | 456 | ypos = s->y * pf->height + s->y_offset; |
457 | 457 | ||
458 | makedelay = false; | ||
458 | if (s->bidir) { /* scroll bidirectional */ | 459 | if (s->bidir) { /* scroll bidirectional */ |
459 | if (s->offset <= 0) { | 460 | if (s->offset <= 0) { |
460 | /* at beginning of line */ | 461 | /* at beginning of line */ |
diff --git a/firmware/drivers/lcd-charcell.c b/firmware/drivers/lcd-charcell.c index 6a40f6ba95..b59b270f9b 100644 --- a/firmware/drivers/lcd-charcell.c +++ b/firmware/drivers/lcd-charcell.c | |||
@@ -569,7 +569,7 @@ void lcd_scroll_fn(void) | |||
569 | int xpos, ypos; | 569 | int xpos, ypos; |
570 | bool update; | 570 | bool update; |
571 | struct viewport* old_vp = current_vp; | 571 | struct viewport* old_vp = current_vp; |
572 | bool makedelay = false; | 572 | bool makedelay; |
573 | 573 | ||
574 | update = false; | 574 | update = false; |
575 | for ( index = 0; index < lcd_scroll_info.lines; index++ ) { | 575 | for ( index = 0; index < lcd_scroll_info.lines; index++ ) { |
@@ -589,6 +589,7 @@ void lcd_scroll_fn(void) | |||
589 | xpos = s->startx; | 589 | xpos = s->startx; |
590 | ypos = s->y; | 590 | ypos = s->y; |
591 | 591 | ||
592 | makedelay = false; | ||
592 | if (s->bidir) /* scroll bidirectional */ | 593 | if (s->bidir) /* scroll bidirectional */ |
593 | { | 594 | { |
594 | if (s->offset <= 0) { | 595 | if (s->offset <= 0) { |