aboutsummaryrefslogtreecommitdiffstats
path: root/src/gdisp/gdisp_gdisp.c
diff options
context:
space:
mode:
authorinmarket <andrewh@inmarket.com.au>2014-09-17 09:34:08 +1000
committerinmarket <andrewh@inmarket.com.au>2014-09-17 09:34:08 +1000
commit3a520359a0bba575eff83e8013b705eacb93aeb4 (patch)
treebbc2173b86b00ef9dab9bcbecee7fe762bfdf8d2 /src/gdisp/gdisp_gdisp.c
parent16fbcdc0b5b73024ab0f41b7d505f3265bf136f0 (diff)
downloaduGFX-3a520359a0bba575eff83e8013b705eacb93aeb4.tar.gz
uGFX-3a520359a0bba575eff83e8013b705eacb93aeb4.tar.bz2
uGFX-3a520359a0bba575eff83e8013b705eacb93aeb4.zip
GDISP updates to match previous GDRIVER and multiple display updates
Diffstat (limited to 'src/gdisp/gdisp_gdisp.c')
-rw-r--r--src/gdisp/gdisp_gdisp.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/src/gdisp/gdisp_gdisp.c b/src/gdisp/gdisp_gdisp.c
index 0e5cacb5..4a149faa 100644
--- a/src/gdisp/gdisp_gdisp.c
+++ b/src/gdisp/gdisp_gdisp.c
@@ -569,7 +569,7 @@ void _gdispInit(void)
// GDISP_DRIVER_LIST is defined - create each driver instance
#if defined(GDISP_DRIVER_LIST)
{
- int i;
+ unsigned i;
extern GDriverVMTList GDISP_DRIVER_LIST;
static const struct GDriverVMT const * dclist[] = {GDISP_DRIVER_LIST};
@@ -579,7 +579,8 @@ void _gdispInit(void)
}
#elif GDISP_TOTAL_DISPLAYS > 1
{
- int i;
+ unsigned i;
+ extern GDriverVMTList GDISPVMT_OnlyOne;
for(i = 0; i < GDISP_TOTAL_DISPLAYS; i++)
gdriverRegister(GDISPVMT_OnlyOne);
@@ -622,7 +623,7 @@ void _gdispDeinit(void)
/* ToDo */
}
-bool_t _gdispInitDriver(GDriver *g, int driverinstance, int systeminstance) {
+bool_t _gdispInitDriver(GDriver *g, unsigned driverinstance, unsigned systeminstance) {
#define gd ((GDisplay *)g)
bool_t ret;
@@ -694,10 +695,18 @@ void _gdispDeInitDriver(GDriver *g) {
#undef gd
}
+GDisplay *gdispGetDisplay(unsigned display) {
+ return (GDisplay *)gdriverGetInstance(GDRIVER_TYPE_DISPLAY, display);
+}
+
void gdispSetDisplay(GDisplay *g) {
if (g) GDISP = g;
}
+unsigned gdispGetDisplayCount(void) {
+ return gdriverInstanceCount(GDRIVER_TYPE_DISPLAY);
+}
+
coord_t gdispGGetWidth(GDisplay *g) { return g->g.Width; }
coord_t gdispGGetHeight(GDisplay *g) { return g->g.Height; }
powermode_t gdispGGetPowerMode(GDisplay *g) { return g->g.Powermode; }