From d6971eaec55ab8e33d10e985db3153b756123784 Mon Sep 17 00:00:00 2001 From: marschap Date: Sun, 12 Jun 2005 16:39:47 +0000 Subject: [PATCH] adapt get_brightness() & set_brightness() to API --- server/drivers/CwLnx.c | 4 ++-- server/drivers/glcdlib.c | 16 ++++++++++------ server/drivers/glcdlib.h | 4 ++-- server/drivers/imon.h | 4 ++-- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/server/drivers/CwLnx.c b/server/drivers/CwLnx.c index a41b244..87a9553 100644 --- a/server/drivers/CwLnx.c +++ b/server/drivers/CwLnx.c @@ -922,7 +922,7 @@ CwLnx_backlight(Driver * drvthis, int on) * API: Get the backlight brightness */ MODULE_EXPORT int -CwLnx_get_brightness(Driver * drvthis) +CwLnx_get_brightness(Driver * drvthis, int state) { PrivateData * p = drvthis->private_data; @@ -934,7 +934,7 @@ CwLnx_get_brightness(Driver * drvthis) * API: Set the backlight brightness */ MODULE_EXPORT void -CwLnx_set_brightness(Driver * drvthis, int promille) +CwLnx_set_brightness(Driver * drvthis, int state, int promille) { PrivateData * p = drvthis->private_data; diff --git a/server/drivers/glcdlib.c b/server/drivers/glcdlib.c index eb82f4e..14c8c64 100644 --- a/server/drivers/glcdlib.c +++ b/server/drivers/glcdlib.c @@ -347,23 +347,27 @@ glcdlib_get_free_chars (Driver *drvthis) } ///////////////////////////////////////////////////////////////// -// Retrieves brightness (in promille ??????) +// Retrieves brightness (in promille) // MODULE_EXPORT int -glcdlib_get_brightness(Driver *drvthis) +glcdlib_get_brightness(Driver *drvthis, int state) { glcdlibPD * pPD = drvthis->private_data; - return 10 * glcddriverGetBrightness(pPD->glcdDriver); + if (state == BACKLIGHT_ON) + return 10 * glcddriverGetBrightness(pPD->glcdDriver); + else + return 0; } ///////////////////////////////////////////////////////////////// -// Sets brightness (in promille ??????) +// Sets brightness (in promille) // MODULE_EXPORT void -glcdlib_set_brightness(Driver *drvthis, int promille) +glcdlib_set_brightness(Driver *drvthis, int state, int promille) { glcdlibPD * pPD = drvthis->private_data; - glcddriverSetBrightness(pPD->glcdDriver, promille/10); + if (state == BACKLIGHT_ON) + glcddriverSetBrightness(pPD->glcdDriver, promille/10); } ///////////////////////////////////////////////////////////////// diff --git a/server/drivers/glcdlib.h b/server/drivers/glcdlib.h index d5d81ad..7cfd68a 100644 --- a/server/drivers/glcdlib.h +++ b/server/drivers/glcdlib.h @@ -42,8 +42,8 @@ MODULE_EXPORT int glcdlib_cellwidth (Driver *drvthis); MODULE_EXPORT int glcdlib_cellheight (Driver *drvthis); MODULE_EXPORT int glcdlib_get_free_chars (Driver *drvthis); MODULE_EXPORT char * glcdlib_get_info (Driver *drvthis); -MODULE_EXPORT int glcdlib_get_brightness(Driver *drvthis); -MODULE_EXPORT void glcdlib_set_brightness(Driver *drvthis, int promille); +MODULE_EXPORT int glcdlib_get_brightness(Driver *drvthis, int state); +MODULE_EXPORT void glcdlib_set_brightness(Driver *drvthis, int state, int promille); MODULE_EXPORT void glcdlib_set_char (Driver *drvthis, int n, char *dat); MODULE_EXPORT void glcdlib_num (Driver *drvthis, int x, int num); MODULE_EXPORT void glcdlib_vbar (Driver *drvthis, int x, int y, int len, int promille, int options); diff --git a/server/drivers/imon.h b/server/drivers/imon.h index 8d7b997..17f66bf 100644 --- a/server/drivers/imon.h +++ b/server/drivers/imon.h @@ -48,8 +48,8 @@ MODULE_EXPORT void imon_hbar (Driver *drvthis, int x, int y, int len, int promil //MODULE_EXPORT int imon_get_free_chars (Driver *drvthis); //MODULE_EXPORT void imon_set_char (Driver *drvthis, int n, char *dat); //MODULE_EXPORT void imon_num (Driver *drvthis, int x, int num); -//MODULE_EXPORT int imon_get_brightness(Driver *drvthis); -//MODULE_EXPORT void imon_set_brightness(Driver *drvthis, int promille); +//MODULE_EXPORT int imon_get_brightness(Driver *drvthis, int state); +//MODULE_EXPORT void imon_set_brightness(Driver *drvthis, int state, int promille); //MODULE_EXPORT void imon_backlight(Driver *drvthis, int on); #endif