diff options
| author | inmarket <andrewh@inmarket.com.au> | 2013-10-19 15:36:05 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2013-10-19 15:36:05 +1000 |
| commit | 87a6af81f4edd9f638238d785aae716749a7fc13 (patch) | |
| tree | 0da0bcebb880331f2a1c4aeb6d911c9398d5b190 /src/gdisp/gdisp.c | |
| parent | 443d14c21f10fea9b0c6fc5559ec4c6b31f99546 (diff) | |
| download | uGFX-87a6af81f4edd9f638238d785aae716749a7fc13.tar.gz uGFX-87a6af81f4edd9f638238d785aae716749a7fc13.tar.bz2 uGFX-87a6af81f4edd9f638238d785aae716749a7fc13.zip | |
Change to gdisp low level driver API. Display number is now in the GDriver structure (It was required for a Nokia driver).
Diffstat (limited to 'src/gdisp/gdisp.c')
| -rw-r--r-- | src/gdisp/gdisp.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/gdisp/gdisp.c b/src/gdisp/gdisp.c index ef388df5..66cd59fd 100644 --- a/src/gdisp/gdisp.c +++ b/src/gdisp/gdisp.c @@ -493,9 +493,9 @@ static void line_clip(GDisplay *g) { /* Our module initialiser */ void _gdispInit(void) { GDisplay *g; - unsigned i; + uint16_t i; #if GDISP_TOTAL_CONTROLLERS > 1 - unsigned j; + uint16_t j; #endif @@ -504,13 +504,17 @@ void _gdispInit(void) { for(g = GDisplayArray, j=0; j < GDISP_TOTAL_CONTROLLERS; j++) for(i = 0; i < DisplayCountList[j]; g++, i++) { g->vmt = ControllerList[j]; + g->systemdisplay = j*GDISP_TOTAL_CONTROLLERS+i; + g->controllerdisplay = i; #else for(g = GDisplayArray, i = 0; i < GDISP_TOTAL_DISPLAYS; g++, i++) { + g->systemdisplay = i; + g->controllerdisplay = i; #endif MUTEX_INIT(g); MUTEX_ENTER(g); g->flags = 0; - gdisp_lld_init(g, i); + gdisp_lld_init(g); // Set the initial clipping region #if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP |