additional verbose messages

git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@955 3ae390bd-cb1e-0410-b409-cd5a39f66f1f

diff --git a/drv_X11.c b/drv_X11.c
index 7310cd14ef35ddb6c11c800e2f5ae54c43c73896..a61ac969c81c122198a872765c7b9c8e4bac99a8 100644 (file)
--- a/drv_X11.c
+++ b/drv_X11.c
@@ -494,7 +494,7 @@ static void plugin_brightness(RESULT * result, const int argc, RESULT * argv[])
 /* list models */
 int drv_X11_list(void)
 {
-    printf("any");
+    printf("any X11 server");
     return 0;
 }
 

diff --git a/drv_serdisplib.c b/drv_serdisplib.c
index 59cea0b6faa50f2752951d69f36d8c8221f09653..b04c48b2c9bb871d63f6dfbdbd2270728ebd738a 100644 (file)
--- a/drv_serdisplib.c
+++ b/drv_serdisplib.c
@@ -186,6 +186,15 @@ static int drv_SD_start(const char *section)
        return -1;
     }
 
+    /* print supported options by display */
+    info("%s: options supported by display %s:", Name, model);
+    serdisp_options_t optiondesc;
+    optiondesc.name = "";      /* start the iteration with assigning an empty string before the first call */
+    while (serdisp_nextoptiondescription(dd, &optiondesc)) {
+       info("  %s", optiondesc.name);
+    }
+
+
     DROWS = serdisp_getheight(dd);
     DCOLS = serdisp_getwidth(dd);
     NUMCOLS = serdisp_getcolours(dd);
@@ -281,16 +290,21 @@ static void plugin_rotate(RESULT * result, RESULT * arg1)
 int drv_SD_list(void)
 {
     serdisp_display_t displaydesc;
+    long version;
 
     if (verbose_level > 0) {
-       printf("  version %i.%i, supported displays:\n",
-              SERDISP_VERSION_GET_MAJOR(SERDISP_VERSION_CODE), SERDISP_VERSION_GET_MINOR(SERDISP_VERSION_CODE));
+       version = serdisp_getversioncode();
+       printf("  linked version %i.%i (compiled with header %i.%i), supported displays:\n",
+              SERDISP_VERSION_GET_MAJOR(version), SERDISP_VERSION_GET_MINOR(version),
+              SERDISP_VERSION_MAJOR, SERDISP_VERSION_MINOR);
+
        displaydesc.dispname = "";
        printf("    display name     alias names           description\n");
        printf("    ---------------  --------------------  -----------------------------------\n");
        while (serdisp_nextdisplaydescription(&displaydesc)) {
            printf("    %-15s  %-20s  %-35s\n", displaydesc.dispname, displaydesc.aliasnames, displaydesc.description);
        }
+
     } else {
        displaydesc.dispname = "";
        while (serdisp_nextdisplaydescription(&displaydesc)) {

diff --git a/svn_version.h b/svn_version.h
index ffe0c540f1d28ab1e7421ccd259d0b3d1a233df0..24ad33f5fc67f24d8c48651b88545e9a1b85a5e5 100644 (file)
--- a/svn_version.h
+++ b/svn_version.h
@@ -1 +1 @@
-#define SVN_VERSION "931"
+#define SVN_VERSION "954M"