diff options
| author | inmarket <andrewh@inmarket.com.au> | 2014-09-26 16:29:52 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2014-09-26 16:29:52 +1000 |
| commit | 72d04f891b5dd09ec4abdc8073a285b5d513946d (patch) | |
| tree | 069d4db609c4ab9fa8ff0d234827caf0421d2bd5 /src/gdisp | |
| parent | 8b1666e72f327c49b75f1f4f59ba55fa24863b3c (diff) | |
| download | uGFX-72d04f891b5dd09ec4abdc8073a285b5d513946d.tar.gz uGFX-72d04f891b5dd09ec4abdc8073a285b5d513946d.tar.bz2 uGFX-72d04f891b5dd09ec4abdc8073a285b5d513946d.zip | |
Change to GDriver to support an initialisation parameter
Diffstat (limited to 'src/gdisp')
| -rw-r--r-- | src/gdisp/driver.h | 2 | ||||
| -rw-r--r-- | src/gdisp/gdisp_gdisp.c | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/gdisp/driver.h b/src/gdisp/driver.h index 98bf64fc..8d22135d 100644 --- a/src/gdisp/driver.h +++ b/src/gdisp/driver.h @@ -620,7 +620,7 @@ typedef struct GDISPVMT { #ifdef __cplusplus extern "C" { #endif - bool_t _gdispInitDriver(GDriver *g, unsigned driverinstance, unsigned systeminstance); + bool_t _gdispInitDriver(GDriver *g, void *param, unsigned driverinstance, unsigned systeminstance); void _gdispPostInitDriver(GDriver *g); void _gdispDeInitDriver(GDriver *g); #ifdef __cplusplus diff --git a/src/gdisp/gdisp_gdisp.c b/src/gdisp/gdisp_gdisp.c index 74cfb67e..1552cea6 100644 --- a/src/gdisp/gdisp_gdisp.c +++ b/src/gdisp/gdisp_gdisp.c @@ -572,7 +572,7 @@ void _gdispInit(void) static const struct GDriverVMT const * dclist[] = {GDISP_DRIVER_LIST}; for(i = 0; i < sizeof(dclist)/sizeof(dclist[0]); i++) - gdriverRegister(dclist[i]); + gdriverRegister(dclist[i], 0); } #elif GDISP_TOTAL_DISPLAYS > 1 { @@ -580,13 +580,13 @@ void _gdispInit(void) extern GDriverVMTList GDISPVMT_OnlyOne; for(i = 0; i < GDISP_TOTAL_DISPLAYS; i++) - gdriverRegister(GDISPVMT_OnlyOne); + gdriverRegister(GDISPVMT_OnlyOne, 0); } #else { extern GDriverVMTList GDISPVMT_OnlyOne; - gdriverRegister(GDISPVMT_OnlyOne); + gdriverRegister(GDISPVMT_OnlyOne, 0); } #endif @@ -620,9 +620,10 @@ void _gdispDeinit(void) /* ToDo */ } -bool_t _gdispInitDriver(GDriver *g, unsigned driverinstance, unsigned systeminstance) { +bool_t _gdispInitDriver(GDriver *g, void *param, unsigned driverinstance, unsigned systeminstance) { #define gd ((GDisplay *)g) bool_t ret; + (void) param; // Intialise fields gd->systemdisplay = systeminstance; |