aboutsummaryrefslogtreecommitdiffstats
path: root/src/tdisp
diff options
context:
space:
mode:
authorAndrew Hannam <andrewh@inmarket.com.au>2013-05-23 20:35:42 -0700
committerAndrew Hannam <andrewh@inmarket.com.au>2013-05-23 20:35:42 -0700
commit42006a67b5ccfd86f30d8a91cc474681c437eaf6 (patch)
tree39b6fa0bd051f274cdacc1925f262bc1a81b4c5e /src/tdisp
parentb5ce2405501aa693fc4c134e3425e74ba0ff7589 (diff)
parent5f2a32714cda6bcfc8829e61895def2f627e1b8f (diff)
downloaduGFX-42006a67b5ccfd86f30d8a91cc474681c437eaf6.tar.gz
uGFX-42006a67b5ccfd86f30d8a91cc474681c437eaf6.tar.bz2
uGFX-42006a67b5ccfd86f30d8a91cc474681c437eaf6.zip
Merge pull request #30 from Tectu/master
Merge Tectu Changes
Diffstat (limited to 'src/tdisp')
-rw-r--r--src/tdisp/tdisp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tdisp/tdisp.c b/src/tdisp/tdisp.c
index a5608acf..42b22cd5 100644
--- a/src/tdisp/tdisp.c
+++ b/src/tdisp/tdisp.c
@@ -72,7 +72,7 @@ void tdispSetCursor(coord_t col, coord_t row) {
MUTEX_LEAVE();
}
-void tdispCreateChar(uint8_t address, uint8_t *charmap) {
+void tdispCreateChar(uint8_t address, char *charmap) {
/* make sure we don't write somewhere we're not supposed to */
if (address < TDISP.maxCustomChars) {
MUTEX_ENTER();