plugin_huawei from Jar

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

diff --git a/Makefile.am b/Makefile.am
index c39038760fb3157845035d8dbf1c5ab0bd292eb4..bd830e6c4a00f379f5810d88e122f492b3d61e80 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -133,6 +133,7 @@ plugin_fifo.c                 \
 plugin_file.c                 \
 plugin_gps.c                  \
 plugin_hddtemp.c              \
+plugin_huawei.c                      \
 plugin_i2c_sensors.c          \
 plugin_iconv.c                \
 plugin_imon.c                 \

diff --git a/Makefile.in b/Makefile.in
index 596a0b22baf76b4cccff81a2cda8701a892d5b60..fbfcfce0b7487eb96a96eb4c6591538725539d92 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -361,6 +361,7 @@ plugin_fifo.c                 \
 plugin_file.c                 \
 plugin_gps.c                  \
 plugin_hddtemp.c              \
+plugin_huawei.c                      \
 plugin_i2c_sensors.c          \
 plugin_iconv.c                \
 plugin_imon.c                 \
@@ -589,6 +590,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugin_file.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugin_gps.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugin_hddtemp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugin_huawei.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugin_i2c_sensors.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugin_iconv.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugin_imon.Po@am__quote@
@@ -748,7 +750,8 @@ distdir: $(DISTFILES)
          fi; \
        done
        -test -n "$(am__skip_mode_fix)" \
-       || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+       || find "$(distdir)" -type d ! -perm -755 \
+               -exec chmod u+rwx,go+rx {} \; -o \
          ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
          ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
          ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
@@ -792,17 +795,17 @@ dist dist-all: distdir
 distcheck: dist
        case '$(DIST_ARCHIVES)' in \
        *.tar.gz*) \
-         GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+         GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
        *.tar.bz2*) \
-         bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+         bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
        *.tar.lzma*) \
-         unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+         lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
        *.tar.xz*) \
          xz -dc $(distdir).tar.xz | $(am__untar) ;;\
        *.tar.Z*) \
          uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
        *.shar.gz*) \
-         GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+         GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
        *.zip*) \
          unzip $(distdir).zip ;;\
        esac

diff --git a/aclocal.m4 b/aclocal.m4
index 9531249ae5dbedb757723888db57f4442ceaf039..e126b9d48ecefd428604ac9194125bf7033c4df7 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 # 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
@@ -9346,7 +9346,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
 [am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11], [],
+m4_if([$1], [1.11.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -9362,7 +9362,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11])dnl
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

diff --git a/config.h.in b/config.h.in
index 5de742c955edbac7a29043e6ecdb57846b9ba70e..5d992ca9107cb99c3f5760198353924f629c3338 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -354,6 +354,9 @@
 /* hddtemp plugin */
 #undef PLUGIN_HDDTEMP
 
+/* huawei plugin */
+#undef PLUGIN_HUAWEI
+
 /* i2c sensors plugin */
 #undef PLUGIN_I2C_SENSORS
 

diff --git a/configure b/configure
index b239e23fe22f2b3d7066cffcc8a997905ba0388f..8dd87052efadc5cca51e3253a50069942eb286a2 100755 (executable)
--- a/configure
+++ b/configure
@@ -7266,13 +7266,17 @@ for plugin in $plugins; do
    case "$plugin" in
       list)
          { $as_echo "$as_me:${as_lineno-$LINENO}: result: available plugins:
-             apm,cpuinfo,dbus,diskstats,dvb,exec,event,file,gps,i2c_sensors,iconv,imon,
-             isdn,kvv,loadavg,meminfo,mpd,mpris_dbus,mysql,netdev,netinfo,pop3,ppp,
-             proc_stat,sample,seti,statfs,uname,uptime,wireless,xmms" >&5
+             apm,asterisk,button_exec,cpuinfo,dbus,diskstats,dvb,exec,event,
+             fifo,file,gps,hddtemp,huawei,i2c_sensors,iconv,imon,isdn,kvv,
+             loadavg,meminfo,mpd,mpris_dbus,mysql,netdev,netinfo,pop3,ppp,
+            proc_stat,python,qnaplog,sample,seti,statfs,uname,uptime,
+             w1retap,wireless,xmms" >&5
 $as_echo "available plugins:
-             apm,cpuinfo,dbus,diskstats,dvb,exec,event,file,gps,i2c_sensors,iconv,imon,
-             isdn,kvv,loadavg,meminfo,mpd,mpris_dbus,mysql,netdev,netinfo,pop3,ppp,
-             proc_stat,sample,seti,statfs,uname,uptime,wireless,xmms" >&6; }
+             apm,asterisk,button_exec,cpuinfo,dbus,diskstats,dvb,exec,event,
+             fifo,file,gps,hddtemp,huawei,i2c_sensors,iconv,imon,isdn,kvv,
+             loadavg,meminfo,mpd,mpris_dbus,mysql,netdev,netinfo,pop3,ppp,
+            proc_stat,python,qnaplog,sample,seti,statfs,uname,uptime,
+             w1retap,wireless,xmms" >&6; }
          as_fn_error "run ./configure --with-plugins=..." "$LINENO" 5
          ;;
       all)
@@ -7289,6 +7293,7 @@ $as_echo "available plugins:
          PLUGIN_FILE="yes"
          PLUGIN_GPS="yes"
          PLUGIN_HDDTEMP="yes"
+         PLUGIN_HUAWEI="yes"
          PLUGIN_I2C_SENSORS="yes"
          PLUGIN_ICONV="yes"
          PLUGIN_IMON="yes"
@@ -7354,6 +7359,9 @@ $as_echo "available plugins:
       hddtemp)
          PLUGIN_HDDTEMP=$val
          ;;
+      huawei)
+         PLUGIN_HUAWEI=$val
+         ;;
       i2c_sensors)
          PLUGIN_I2C_SENSORS=$val
         ;;
@@ -7764,6 +7772,14 @@ $as_echo "#define PLUGIN_HDDTEMP 1" >>confdefs.h
 
 fi
 
+# Huawei
+if test "$PLUGIN_HUAWEI" = "yes"; then
+   PLUGINS="$PLUGINS plugin_huawei.o"
+
+$as_echo "#define PLUGIN_HUAWEI 1" >>confdefs.h
+
+fi
+
 # I2C
 if test "$PLUGIN_I2C_SENSORS" = "yes"; then
    PLUGINS="$PLUGINS plugin_i2c_sensors.o"
@@ -12478,13 +12494,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:12481: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:12497: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:12484: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:12500: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:12487: output\"" >&5)
+  (eval echo "\"\$as_me:12503: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -13678,7 +13694,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 13681 "configure"' > conftest.$ac_ext
+  echo '#line 13697 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -14936,11 +14952,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14939: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14955: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14943: \$? = $ac_status" >&5
+   echo "$as_me:14959: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -15275,11 +15291,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15278: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15294: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15282: \$? = $ac_status" >&5
+   echo "$as_me:15298: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -15380,11 +15396,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15383: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15399: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15387: \$? = $ac_status" >&5
+   echo "$as_me:15403: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15435,11 +15451,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15438: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15454: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15442: \$? = $ac_status" >&5
+   echo "$as_me:15458: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -17819,7 +17835,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 17822 "configure"
+#line 17838 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -17915,7 +17931,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 17918 "configure"
+#line 17934 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H

diff --git a/plugin.c b/plugin.c
index abd48343f07bd7d2934a011662bd5c52ce845dad..cd8f2a3445e2e1c5ac4e9cb6af31584a111c057b 100644 (file)
--- a/plugin.c
+++ b/plugin.c
@@ -90,6 +90,9 @@ char *Plugins[] = {
 #ifdef PLUGIN_HDDTEMP
     "hddtemp",
 #endif
+#ifdef PLUGIN_HUAWEI
+    "huawei",
+#endif
 #ifdef PLUGIN_I2C_SENSORS
     "i2c_sensors",
 #endif
@@ -204,6 +207,8 @@ int plugin_init_gps(void);
 void plugin_exit_gps(void);
 int plugin_init_hddtemp(void);
 void plugin_exit_hddtemp(void);
+int plugin_init_huawei(void);
+void plugin_exit_huawei(void);
 int plugin_init_i2c_sensors(void);
 void plugin_exit_i2c_sensors(void);
 int plugin_init_imon(void);
@@ -317,6 +322,9 @@ int plugin_init(void)
 #ifdef PLUGIN_HDDTEMP
     plugin_init_hddtemp();
 #endif
+#ifdef PLUGIN_HUAWEI
+    plugin_init_huawei();
+#endif
 #ifdef PLUGIN_I2C_SENSORS
     plugin_init_i2c_sensors();
 #endif
@@ -432,6 +440,9 @@ void plugin_exit(void)
 #ifdef PLUGIN_GPS
     plugin_exit_gps();
 #endif
+#ifdef PLUGIN_HUAWEI
+    plugin_exit_huawei();
+#endif
 #ifdef PLUGIN_I2C_SENSORS
     plugin_exit_i2c_sensors();
 #endif

diff --git a/plugins.m4 b/plugins.m4
index 009e28b6ec7d02764958ab6b54e6afc6b8c4097d..ce38a93b0516e8764b449d89dede8f2b9818a583 100644 (file)
--- a/plugins.m4
+++ b/plugins.m4
@@ -53,9 +53,11 @@ for plugin in $plugins; do
       list)
          AC_MSG_RESULT(
             [available plugins:]
-            [ apm,cpuinfo,dbus,diskstats,dvb,exec,event,file,gps,i2c_sensors,iconv,imon,]
-            [ isdn,kvv,loadavg,meminfo,mpd,mpris_dbus,mysql,netdev,netinfo,pop3,ppp,]
-            [ proc_stat,sample,seti,statfs,uname,uptime,wireless,xmms])
+            [ apm,asterisk,button_exec,cpuinfo,dbus,diskstats,dvb,exec,event,]
+            [ fifo,file,gps,hddtemp,huawei,i2c_sensors,iconv,imon,isdn,kvv,]
+            [ loadavg,meminfo,mpd,mpris_dbus,mysql,netdev,netinfo,pop3,ppp,]
+           [ proc_stat,python,qnaplog,sample,seti,statfs,uname,uptime,]
+            [ w1retap,wireless,xmms])
          AC_MSG_ERROR([run ./configure --with-plugins=...])
          ;;
       all)
@@ -72,6 +74,7 @@ for plugin in $plugins; do
          PLUGIN_FILE="yes"
          PLUGIN_GPS="yes"
          PLUGIN_HDDTEMP="yes"
+         PLUGIN_HUAWEI="yes"
          PLUGIN_I2C_SENSORS="yes"
          PLUGIN_ICONV="yes"
          PLUGIN_IMON="yes"
@@ -137,6 +140,9 @@ for plugin in $plugins; do
       hddtemp)
          PLUGIN_HDDTEMP=$val
          ;;
+      huawei)
+         PLUGIN_HUAWEI=$val
+         ;;
       i2c_sensors)
          PLUGIN_I2C_SENSORS=$val
         ;;
@@ -339,6 +345,12 @@ if test "$PLUGIN_HDDTEMP" = "yes"; then
    AC_DEFINE(PLUGIN_HDDTEMP,1,[hddtemp plugin])
 fi
 
+# Huawei
+if test "$PLUGIN_HUAWEI" = "yes"; then
+   PLUGINS="$PLUGINS plugin_huawei.o"
+   AC_DEFINE(PLUGIN_HUAWEI,1,[huawei plugin])
+fi
+
 # I2C
 if test "$PLUGIN_I2C_SENSORS" = "yes"; then
    PLUGINS="$PLUGINS plugin_i2c_sensors.o"

diff --git a/smoketest.sh b/smoketest.sh
index 0a86ddb514abe627195e9cc4b58cef962558b75a..95ebcde8f5b06b378ad4129930f879b2e4b4b36f 100755 (executable)
--- a/smoketest.sh
+++ b/smoketest.sh
@@ -23,7 +23,7 @@ for driver in BeckmannEgle BWCT CrystalFontz Curses Cwlinux D4D EA232graphic G15
     
 done
 
-for plugin in apm asterisk button_exec cpuinfo dbus diskstats dvb exec fifo file hddtemp i2c_sensors iconv imon isdn kvv loadavg meminfo mpd mysql netdev netinfo pop3 ppp proc_stat python sample seti statfs uname uptime w1retap wireless xmms; do
+for plugin in apm asterisk button_exec cpuinfo dbus diskstats dvb exec event fifo file gps hddtemp huawei i2c_sensors iconv imon isdn kvv loadavg meminfo mpd mpris_dbus mysql netdev netinfo pop3 ppp proc_stat python qnaplog sample seti statfs uname uptime w1retap wireless xmms; do
 
     make distclean
     ./configure --with-drivers=NULL --with-plugins=$plugin