[lcd4linux @ 2004-06-06 06:51:59 by reinelt]

do not display end splash screen if quiet=1

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

diff --git a/drv.c b/drv.c
index cccfbde0a5c5d64097ec0cc0f96934af9c266ba2..4c2a6e87e2279e7875ff6d056b2a0a4b063e57d9 100644 (file)
--- a/drv.c
+++ b/drv.c
@@ -1,4 +1,4 @@
-/* $Id: drv.c,v 1.17 2004/06/02 10:09:22 reinelt Exp $
+/* $Id: drv.c,v 1.18 2004/06/06 06:51:59 reinelt Exp $
  *
  * new framework for display drivers
  *
@@ -23,6 +23,10 @@
  *
  *
  * $Log: drv.c,v $
+ * Revision 1.18  2004/06/06 06:51:59  reinelt
+ *
+ * do not display end splash screen if quiet=1
+ *
  * Revision 1.17  2004/06/02 10:09:22  reinelt
  *
  * splash screen for HD44780
@@ -241,8 +245,8 @@ int drv_init (char *section, char *driver, int quiet)
 }
 
 
-int drv_quit (void)
+int drv_quit (int quiet)
 {
   if (Drv->quit == NULL) return 0;
-  return Drv->quit();
+  return Drv->quit(quiet);
 }

diff --git a/drv.h b/drv.h
index 7bceea24bc0d08c8fea649d74b4c3eda46f15bcc..4635c3dec3b88ad2e7e6889a423aba4f86f1fabb 100644 (file)
--- a/drv.h
+++ b/drv.h
@@ -1,4 +1,4 @@
-/* $Id: drv.h,v 1.4 2004/06/02 09:41:19 reinelt Exp $
+/* $Id: drv.h,v 1.5 2004/06/06 06:51:59 reinelt Exp $
  *
  * new framework for display drivers
  *
@@ -23,6 +23,10 @@
  *
  *
  * $Log: drv.h,v $
+ * Revision 1.5  2004/06/06 06:51:59  reinelt
+ *
+ * do not display end splash screen if quiet=1
+ *
  * Revision 1.4  2004/06/02 09:41:19  reinelt
  *
  * prepared support for startup splash screen
@@ -53,8 +57,7 @@ typedef struct DRIVER {
   char *name;
   int (*list)  (void);
   int (*init)  (char *section, int quiet);
-  int (*greet) (int start_stop);
-  int (*quit)  (void);
+  int (*quit)  (int quiet);
 } DRIVER;
 
 
@@ -65,6 +68,6 @@ extern char *output;
 
 int drv_list (void);
 int drv_init (char *section, char *driver, int quiet);
-int drv_quit (void);
+int drv_quit (int quiet);
 
 #endif

diff --git a/drv_BeckmannEgle.c b/drv_BeckmannEgle.c
index 6975a43494a0c562dfb001556d3407c6fa7f3b2d..082fad72b5db2fb7b51169c1e8b1ee1410f5009d 100644 (file)
--- a/drv_BeckmannEgle.c
+++ b/drv_BeckmannEgle.c
@@ -1,4 +1,4 @@
-/* $Id: drv_BeckmannEgle.c,v 1.6 2004/06/05 06:41:39 reinelt Exp $
+/* $Id: drv_BeckmannEgle.c,v 1.7 2004/06/06 06:51:59 reinelt Exp $
  *
  * driver for Beckmann+Egle mini terminals
  * Copyright 2000 Michael Reinelt <reinelt@eunet.at>
@@ -22,6 +22,10 @@
  *
  *
  * $Log: drv_BeckmannEgle.c,v $
+ * Revision 1.7  2004/06/06 06:51:59  reinelt
+ *
+ * do not display end splash screen if quiet=1
+ *
  * Revision 1.6  2004/06/05 06:41:39  reinelt
  *
  * chancged splash screen again
@@ -291,7 +295,7 @@ int drv_BE_init (char *section, int quiet)
 
 
 // close driver & display
-int drv_BE_quit (void) {
+int drv_BE_quit (int quiet) {
 
   info("%s: shutting down.", Name);
 
@@ -301,8 +305,10 @@ int drv_BE_quit (void) {
   drv_BE_clear();
 
   // say goodbye...
-  drv_generic_text_greet ("goodbye!", NULL);
-
+  if (!quiet) {
+    drv_generic_text_greet ("goodbye!", NULL);
+  }
+  
   drv_generic_serial_close();
 
   return (0);

diff --git a/drv_Crystalfontz.c b/drv_Crystalfontz.c
index eb35b982711b3f28fcd8ae149541fa0b93a203f6..fb75ac00724f7ef30ebb5e6c851fe485322ee504 100644 (file)
--- a/drv_Crystalfontz.c
+++ b/drv_Crystalfontz.c
@@ -1,4 +1,4 @@
-/* $Id: drv_Crystalfontz.c,v 1.25 2004/06/05 06:41:39 reinelt Exp $
+/* $Id: drv_Crystalfontz.c,v 1.26 2004/06/06 06:51:59 reinelt Exp $
  *
  * new style driver for Crystalfontz display modules
  *
@@ -23,6 +23,10 @@
  *
  *
  * $Log: drv_Crystalfontz.c,v $
+ * Revision 1.26  2004/06/06 06:51:59  reinelt
+ *
+ * do not display end splash screen if quiet=1
+ *
  * Revision 1.25  2004/06/05 06:41:39  reinelt
  *
  * chancged splash screen again
@@ -1027,7 +1031,7 @@ int drv_CF_init (char *section, int quiet)
 
 
 // close driver & display
-int drv_CF_quit (void) {
+int drv_CF_quit (int quiet) {
 
   info("%s: shutting down.", Name);
 
@@ -1037,7 +1041,9 @@ int drv_CF_quit (void) {
   drv_CF_clear();
   
   // say goodbye...
-  drv_generic_text_greet ("goodbye!", NULL);
+  if (!quiet) {
+    drv_generic_text_greet ("goodbye!", NULL);
+  }
 
   drv_generic_serial_close();
   

diff --git a/drv_Curses.c b/drv_Curses.c
index 31432374cfdd8283d8224fe290bef7b308a58566..7550e6bca0255353976692abe5ed823ebdd08f5f 100644 (file)
--- a/drv_Curses.c
+++ b/drv_Curses.c
@@ -1,4 +1,4 @@
-/* $Id: drv_Curses.c,v 1.4 2004/06/05 06:41:39 reinelt Exp $
+/* $Id: drv_Curses.c,v 1.5 2004/06/06 06:51:59 reinelt Exp $
  *
  * pure ncurses based text driver
  *
@@ -26,6 +26,10 @@
  *
  *
  * $Log: drv_Curses.c,v $
+ * Revision 1.5  2004/06/06 06:51:59  reinelt
+ *
+ * do not display end splash screen if quiet=1
+ *
  * Revision 1.4  2004/06/05 06:41:39  reinelt
  *
  * chancged splash screen again
@@ -292,7 +296,7 @@ int drv_Curs_init (char *section, int quiet)
 
 
 // close driver & display
-int drv_Curs_quit (void) {
+int drv_Curs_quit (int quiet) {
 
   info("%s: shutting down.", Name);
 
@@ -302,8 +306,10 @@ int drv_Curs_quit (void) {
   drv_Curs_clear();
 
   // say goodbye...
-  drv_generic_text_greet ("goodbye!", NULL);
-
+  if (!quiet) {
+    drv_generic_text_greet ("goodbye!", NULL);
+  }
+  
   endwin();
   
   return (0);

diff --git a/drv_Cwlinux.c b/drv_Cwlinux.c
index 8b6987ded17d37a60821919a9de2577ae2f4114b..9d230884f7c4b0681e91bdb7d9d177eb07b1c366 100644 (file)
--- a/drv_Cwlinux.c
+++ b/drv_Cwlinux.c
@@ -1,4 +1,4 @@
-/* $Id: drv_Cwlinux.c,v 1.15 2004/06/05 14:56:48 reinelt Exp $
+/* $Id: drv_Cwlinux.c,v 1.16 2004/06/06 06:51:59 reinelt Exp $
  *
  * new style driver for Cwlinux display modules
  *
@@ -23,6 +23,10 @@
  *
  *
  * $Log: drv_Cwlinux.c,v $
+ * Revision 1.16  2004/06/06 06:51:59  reinelt
+ *
+ * do not display end splash screen if quiet=1
+ *
  * Revision 1.15  2004/06/05 14:56:48  reinelt
  *
  * Cwlinux splash screen fixed
@@ -441,7 +445,7 @@ int drv_CW_init (char *section, int quiet)
 
 
 // close driver & display
-int drv_CW_quit (void) {
+int drv_CW_quit (int quiet) {
 
   info("%s: shutting down.", Name);
   drv_generic_text_quit();
@@ -450,7 +454,9 @@ int drv_CW_quit (void) {
   drv_CW_clear();
   
   // say goodbye...
-  drv_generic_text_greet ("goodbye!", NULL);
+  if (!quiet) {
+    drv_generic_text_greet ("goodbye!", NULL);
+  }
 
   drv_generic_serial_close();
   

diff --git a/drv_HD44780.c b/drv_HD44780.c
index b646cf2ac8a40b3426261265ef0d4091c9875bcd..f71bab8578b51f262cc3fcd83308c4ee57a85231 100644 (file)
--- a/drv_HD44780.c
+++ b/drv_HD44780.c
@@ -1,4 +1,4 @@
-/* $Id: drv_HD44780.c,v 1.28 2004/06/05 06:41:39 reinelt Exp $
+/* $Id: drv_HD44780.c,v 1.29 2004/06/06 06:51:59 reinelt Exp $
  *
  * new style driver for HD44780-based displays
  *
@@ -29,6 +29,10 @@
  *
  *
  * $Log: drv_HD44780.c,v $
+ * Revision 1.29  2004/06/06 06:51:59  reinelt
+ *
+ * do not display end splash screen if quiet=1
+ *
  * Revision 1.28  2004/06/05 06:41:39  reinelt
  *
  * chancged splash screen again
@@ -870,7 +874,7 @@ int drv_HD_init (char *section, int quiet)
 
 
 // close driver & display
-int drv_HD_quit (void) {
+int drv_HD_quit (int quiet) {
 
   info("%s: shutting down.", Name);
 
@@ -880,8 +884,10 @@ int drv_HD_quit (void) {
   drv_HD_clear();
   
   // say goodbye...
-  drv_generic_text_greet ("goodbye!", NULL);
-
+  if (!quiet) {
+    drv_generic_text_greet ("goodbye!", NULL);
+  }
+  
   // clear all signals
   if (Bits==8) {
     drv_generic_parport_control (SIGNAL_RS|SIGNAL_RW|SIGNAL_ENABLE|SIGNAL_ENABLE2|SIGNAL_GPO, 0);

diff --git a/drv_Image.c b/drv_Image.c
index ab9a83b4fa5bd52daab675345f2e3982c19ea994..c17e6ef102248c7b6581387b756f5292ffaa1507 100644 (file)
--- a/drv_Image.c
+++ b/drv_Image.c
@@ -1,4 +1,4 @@
-/* $Id: drv_Image.c,v 1.4 2004/06/02 09:41:19 reinelt Exp $
+/* $Id: drv_Image.c,v 1.5 2004/06/06 06:51:59 reinelt Exp $
  *
  * new style Image (PPM/PNG) Driver for LCD4Linux 
  *
@@ -23,6 +23,10 @@
  *
  *
  * $Log: drv_Image.c,v $
+ * Revision 1.5  2004/06/06 06:51:59  reinelt
+ *
+ * do not display end splash screen if quiet=1
+ *
  * Revision 1.4  2004/06/02 09:41:19  reinelt
  *
  * prepared support for startup splash screen
@@ -516,7 +520,7 @@ int drv_IMG_init (char *section, int quiet)
 
 
 // close driver & display
-int drv_IMG_quit (void) {
+int drv_IMG_quit (int quiet) {
 
   info("%s: shutting down.", Name);
   drv_generic_graphic_quit();

diff --git a/drv_M50530.c b/drv_M50530.c
index cad20086827b5216097c5f0deedf4bb920fd44d5..2749912d42c651bfafdc2acea849456b4651d700 100644 (file)
--- a/drv_M50530.c
+++ b/drv_M50530.c
@@ -1,4 +1,4 @@
-/* $Id: drv_M50530.c,v 1.10 2004/06/05 06:41:39 reinelt Exp $
+/* $Id: drv_M50530.c,v 1.11 2004/06/06 06:51:59 reinelt Exp $
  *
  * new style driver for M50530-based displays
  *
@@ -23,6 +23,10 @@
  *
  *
  * $Log: drv_M50530.c,v $
+ * Revision 1.11  2004/06/06 06:51:59  reinelt
+ *
+ * do not display end splash screen if quiet=1
+ *
  * Revision 1.10  2004/06/05 06:41:39  reinelt
  *
  * chancged splash screen again
@@ -384,7 +388,7 @@ int drv_M5_init (char *section, int quiet)
 
 
 // close driver & display
-int drv_M5_quit (void) {
+int drv_M5_quit (int quiet) {
 
   info("%s: shutting down.", Name);
 
@@ -394,8 +398,10 @@ int drv_M5_quit (void) {
   drv_M5_clear();
   
   // say goodbye...
-  drv_generic_text_greet ("goodbye!", NULL);
-
+  if (!quiet) {
+    drv_generic_text_greet ("goodbye!", NULL);
+  }
+  
   // clear all signals
   drv_generic_parport_control (SIGNAL_EX|SIGNAL_IOC1|SIGNAL_IOC2|SIGNAL_GPO, 0);
   

diff --git a/drv_MatrixOrbital.c b/drv_MatrixOrbital.c
index 2c8c2bb59b86bd8d880df7342e8c1a3cd170ca1b..6e7cbc8d95c6a6555f30c59c9269c9086cda2146 100644 (file)
--- a/drv_MatrixOrbital.c
+++ b/drv_MatrixOrbital.c
@@ -1,4 +1,4 @@
-/* $Id: drv_MatrixOrbital.c,v 1.31 2004/06/05 06:41:39 reinelt Exp $
+/* $Id: drv_MatrixOrbital.c,v 1.32 2004/06/06 06:51:59 reinelt Exp $
  *
  * new style driver for Matrix Orbital serial display modules
  *
@@ -23,6 +23,10 @@
  *
  *
  * $Log: drv_MatrixOrbital.c,v $
+ * Revision 1.32  2004/06/06 06:51:59  reinelt
+ *
+ * do not display end splash screen if quiet=1
+ *
  * Revision 1.31  2004/06/05 06:41:39  reinelt
  *
  * chancged splash screen again
@@ -703,7 +707,7 @@ int drv_MO_init (char *section, int quiet)
 
 
 // close driver & display
-int drv_MO_quit (void) {
+int drv_MO_quit (int quiet) {
 
   info("%s: shutting down.", Name);
 
@@ -713,8 +717,10 @@ int drv_MO_quit (void) {
   drv_MO_clear();
   
   // say goodbye...
-  drv_generic_text_greet ("goodbye!", NULL);
-
+  if (!quiet) {
+    drv_generic_text_greet ("goodbye!", NULL);
+  }
+  
   drv_generic_serial_close();
   
   return (0);

diff --git a/drv_MilfordInstruments.c b/drv_MilfordInstruments.c
index f954a9237851f76831e7bb0d3e26555aa9e2830c..8e9e6bbedd998729fbf44ea92bb7e51d37d2ec81 100644 (file)
--- a/drv_MilfordInstruments.c
+++ b/drv_MilfordInstruments.c
@@ -1,4 +1,4 @@
-/* $Id: drv_MilfordInstruments.c,v 1.8 2004/06/05 06:41:40 reinelt Exp $
+/* $Id: drv_MilfordInstruments.c,v 1.9 2004/06/06 06:51:59 reinelt Exp $
  *
  * driver for Milford Instruments 'BPK' piggy-back serial interface board
  * for standard Hitachi 44780 compatible lcd modules.
@@ -27,6 +27,10 @@
  *
  *
  * $Log: drv_MilfordInstruments.c,v $
+ * Revision 1.9  2004/06/06 06:51:59  reinelt
+ *
+ * do not display end splash screen if quiet=1
+ *
  * Revision 1.8  2004/06/05 06:41:40  reinelt
  *
  * chancged splash screen again
@@ -281,7 +285,7 @@ int drv_MI_init (char *section, int quiet)
 
 
 // close driver & display
-int drv_MI_quit (void) {
+int drv_MI_quit (int quiet) {
 
   info("%s: shutting down.", Name);
 
@@ -291,8 +295,10 @@ int drv_MI_quit (void) {
   drv_MI_clear();
   
   // say goodbye...
-  drv_generic_text_greet ("goodbye!", NULL);
-
+  if (!quiet) {
+    drv_generic_text_greet ("goodbye!", NULL);
+  }
+  
   drv_generic_serial_close();
   
   return (0);

diff --git a/drv_NULL.c b/drv_NULL.c
index 4e6be5d67641d4b1b2c247358ed3c9460667593e..daafeedb2752a6489a21f05adf5c96dc57d797a8 100644 (file)
--- a/drv_NULL.c
+++ b/drv_NULL.c
@@ -1,4 +1,4 @@
-/* $Id: drv_NULL.c,v 1.2 2004/06/02 09:41:19 reinelt Exp $
+/* $Id: drv_NULL.c,v 1.3 2004/06/06 06:51:59 reinelt Exp $
  *
  * NULL driver (for testing)
  *
@@ -23,6 +23,10 @@
  *
  *
  * $Log: drv_NULL.c,v $
+ * Revision 1.3  2004/06/06 06:51:59  reinelt
+ *
+ * do not display end splash screen if quiet=1
+ *
  * Revision 1.2  2004/06/02 09:41:19  reinelt
  *
  * prepared support for startup splash screen
@@ -178,7 +182,7 @@ int drv_NULL_init (char *section, int quiet)
 
 
 // close driver & display
-int drv_NULL_quit (void) {
+int drv_NULL_quit (int quiet) {
 
   info("%s: shutting down.", Name);
   drv_generic_text_quit();

diff --git a/drv_T6963.c b/drv_T6963.c
index fc744753776dfd41794c77d7ac58e356fffa5d1c..d3a62b39c654badada41eff7f40ee23db0203f0e 100644 (file)
--- a/drv_T6963.c
+++ b/drv_T6963.c
@@ -1,4 +1,4 @@
-/* $Id: drv_T6963.c,v 1.6 2004/06/02 09:41:19 reinelt Exp $
+/* $Id: drv_T6963.c,v 1.7 2004/06/06 06:51:59 reinelt Exp $
  *
  * new style driver for T6963-based displays
  *
@@ -23,6 +23,10 @@
  *
  *
  * $Log: drv_T6963.c,v $
+ * Revision 1.7  2004/06/06 06:51:59  reinelt
+ *
+ * do not display end splash screen if quiet=1
+ *
  * Revision 1.6  2004/06/02 09:41:19  reinelt
  *
  * prepared support for startup splash screen
@@ -556,7 +560,7 @@ int drv_T6_init (char *section, int quiet)
 
 
 // close driver & display
-int drv_T6_quit (void) {
+int drv_T6_quit (int quiet) {
 
   info("%s: shutting down.", Name);
   drv_generic_parport_close();

diff --git a/drv_USBLCD.c b/drv_USBLCD.c
index d7d05c5474efd75db835003704e4b21d7d49c239..ec4d39d356483c716c5fb4ff9055859bd7a0d5ee 100644 (file)
--- a/drv_USBLCD.c
+++ b/drv_USBLCD.c
@@ -1,4 +1,4 @@
-/* $Id: drv_USBLCD.c,v 1.9 2004/06/05 14:56:48 reinelt Exp $
+/* $Id: drv_USBLCD.c,v 1.10 2004/06/06 06:51:59 reinelt Exp $
  *
  * new style driver for USBLCD displays
  *
@@ -26,6 +26,10 @@
  *
  *
  * $Log: drv_USBLCD.c,v $
+ * Revision 1.10  2004/06/06 06:51:59  reinelt
+ *
+ * do not display end splash screen if quiet=1
+ *
  * Revision 1.9  2004/06/05 14:56:48  reinelt
  *
  * Cwlinux splash screen fixed
@@ -389,7 +393,7 @@ int drv_UL_init (char *section, int quiet)
 
 
 // close driver & display
-int drv_UL_quit (void) 
+int drv_UL_quit (int quiet) 
 {
 
   info("%s: shutting down.", Name);
@@ -403,8 +407,10 @@ int drv_UL_quit (void)
   drv_UL_clear();
   
   // say goodbye...
-  drv_generic_text_greet ("goodbye!", NULL);
-  
+  if (!quiet) {
+    drv_generic_text_greet ("goodbye!", NULL);
+  }
+
   debug ("closing port %s", Port);
   close(usblcd_file);
   

diff --git a/drv_X11.c b/drv_X11.c
index 69256c71945c4219c740290188a05c80931f277f..9deed933d6b0ce4a5d1723cc6c1d12633c5dc739 100644 (file)
--- a/drv_X11.c
+++ b/drv_X11.c
@@ -1,4 +1,4 @@
-/* $Id: drv_X11.c,v 1.3 2004/06/02 09:41:19 reinelt Exp $
+/* $Id: drv_X11.c,v 1.4 2004/06/06 06:51:59 reinelt Exp $
  *
  * new style X11 Driver for LCD4Linux 
  *
@@ -26,6 +26,10 @@
  *
  *
  * $Log: drv_X11.c,v $
+ * Revision 1.4  2004/06/06 06:51:59  reinelt
+ *
+ * do not display end splash screen if quiet=1
+ *
  * Revision 1.3  2004/06/02 09:41:19  reinelt
  *
  * prepared support for startup splash screen
@@ -384,7 +388,7 @@ int drv_X11_init (char *section, int quiet)
 
 
 // close driver & display
-int drv_X11_quit (void) {
+int drv_X11_quit (int quiet) {
 
   info("%s: shutting down.", Name);
   drv_generic_graphic_quit();

diff --git a/lcd4linux.c b/lcd4linux.c
index 857100eba0aba4786bd5d16598e1687a7db40f94..77aafe4b0c32cba880d045b44ba314faf488d702 100644 (file)
--- a/lcd4linux.c
+++ b/lcd4linux.c
@@ -1,4 +1,4 @@
-/* $Id: lcd4linux.c,v 1.71 2004/06/02 09:41:19 reinelt Exp $
+/* $Id: lcd4linux.c,v 1.72 2004/06/06 06:51:59 reinelt Exp $
  *
  * LCD4Linux
  *
@@ -23,6 +23,10 @@
  *
  *
  * $Log: lcd4linux.c,v $
+ * Revision 1.72  2004/06/06 06:51:59  reinelt
+ *
+ * do not display end splash screen if quiet=1
+ *
  * Revision 1.71  2004/06/02 09:41:19  reinelt
  *
  * prepared support for startup splash screen
@@ -591,7 +595,7 @@ int main (int argc, char *argv[])
   // go into interactive mode (display has been initialized)
   if (interactive >= 1) {
     interactive_mode();
-    drv_quit();
+    drv_quit(quiet);
     pid_exit(PIDFILE);
     cfg_exit();
     exit (0);
@@ -623,11 +627,12 @@ int main (int argc, char *argv[])
   
   debug ("leaving main loop");
   
-  drv_quit();
+  drv_quit(quiet);
   pid_exit(PIDFILE);
   cfg_exit();
   plugin_exit();    
   timer_exit();
+
   if (got_signal==SIGHUP) {
     long fd;
     debug ("restarting...");
@@ -646,6 +651,7 @@ int main (int argc, char *argv[])
     free(my_argv[c]);
   }
   free(my_argv);
+
   exit (0);
 }