diff options
| author | trsaunders <trsaunders@gmail.com> | 2012-07-25 18:37:49 +0100 |
|---|---|---|
| committer | trsaunders <trsaunders@gmail.com> | 2012-07-25 18:37:49 +0100 |
| commit | ce5fd37e9ba70d8171b2f27e8afa587a2ac34937 (patch) | |
| tree | 4b2f9b46b12e70fae396f09e5bc05a882e30d482 /drivers | |
| parent | f6ce96a444cd12c0f0d5e835b685f0f2e3dd5cae (diff) | |
| parent | 999486233dd5ec388a8c1c676c19effc6047b090 (diff) | |
| download | uGFX-ce5fd37e9ba70d8171b2f27e8afa587a2ac34937.tar.gz uGFX-ce5fd37e9ba70d8171b2f27e8afa587a2ac34937.tar.bz2 uGFX-ce5fd37e9ba70d8171b2f27e8afa587a2ac34937.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/lcd/ssd1289_lld.c | 2 | ||||
| -rw-r--r-- | drivers/lcd/ssd1289_lld.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/lcd/ssd1289_lld.c b/drivers/lcd/ssd1289_lld.c index 09769a4b..04d69a2a 100644 --- a/drivers/lcd/ssd1289_lld.c +++ b/drivers/lcd/ssd1289_lld.c @@ -417,7 +417,7 @@ uint16_t lld_lcdGetWidth(void) { } /* a positive lines value shifts the screen up, negative down */ -void lld_lcdVerticalScroll(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t lines) { +void lld_lcdVerticalScroll(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, int16_t lines) { uint16_t row0, row1; uint16_t i; diff --git a/drivers/lcd/ssd1289_lld.h b/drivers/lcd/ssd1289_lld.h index bea4bedf..16a9ef0d 100644 --- a/drivers/lcd/ssd1289_lld.h +++ b/drivers/lcd/ssd1289_lld.h @@ -24,7 +24,7 @@ uint16_t lld_lcdGetPixelColor(uint16_t x, uint16_t y); uint16_t lld_lcdGetOrientation(void); uint16_t lld_lcdGetHeight(void); uint16_t lld_lcdGetWidth(void); -void lld_lcdVerticalScroll(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t lines); +void lld_lcdVerticalScroll(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, int16_t lines); #ifdef __cplusplus } |