From ec5b32b30499f5bdb44eeb3abc343dd4c9c2e507 Mon Sep 17 00:00:00 2001 From: reinelt <> Date: Sat, 14 Feb 2004 11:56:17 +0000 Subject: [lcd4linux @ 2004-02-14 11:56:11 by reinelt] M50530 driver ported changed lots of 'char' to 'unsigned char' --- Makefile.am | 2 +- Makefile.in | 24 ++++++------ aclocal.m4 | 21 ++++------ configure | 104 ++++++++++++++++++-------------------------------- configure.in | 4 +- drv.c | 12 ++++-- drv_Crystalfontz.c | 16 +++++--- drv_Cwlinux.c | 10 +++-- drv_HD44780.c | 14 ++++--- drv_MatrixOrbital.c | 8 +++- drv_generic_serial.c | 18 +++++---- drv_generic_serial.h | 12 ++++-- drv_generic_text.c | 10 +++-- drv_generic_text.h | 10 +++-- lcd4linux.conf.sample | 19 +++++++-- plugin_i2c_sensors.c | 33 ++++++++-------- 16 files changed, 167 insertions(+), 150 deletions(-) diff --git a/Makefile.am b/Makefile.am index b181a2f..06fec0e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -72,7 +72,7 @@ BeckmannEgle.c \ drv_Crystalfontz.c \ drv_Cwlinux.c \ HD44780.c \ -M50530.c \ +drv_M50530.c \ T6963.c \ USBLCD.c \ drv_MatrixOrbital.c \ diff --git a/Makefile.in b/Makefile.in index dd1a8ff..233acf4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -125,7 +125,7 @@ lcd4linux_SOURCES = lcd4linux.c cfg.c cfg.h deb #fontmap.c fontmap.h \ #udelay.c udelay.h -EXTRA_lcd4linux_SOURCES = drv_generic_text.c drv_generic_text.h drv_generic_serial.c drv_generic_serial.h drv_generic_parport.c drv_generic_parport.h BeckmannEgle.c drv_Crystalfontz.c drv_Cwlinux.c HD44780.c M50530.c T6963.c USBLCD.c drv_MatrixOrbital.c MilfordInstruments.c PalmPilot.c Raster.c SIN.c XWindow.c Text.c +EXTRA_lcd4linux_SOURCES = drv_generic_text.c drv_generic_text.h drv_generic_serial.c drv_generic_serial.h drv_generic_parport.c drv_generic_parport.h BeckmannEgle.c drv_Crystalfontz.c drv_Cwlinux.c HD44780.c drv_M50530.c T6963.c USBLCD.c drv_MatrixOrbital.c MilfordInstruments.c PalmPilot.c Raster.c SIN.c XWindow.c Text.c EXTRA_DIST = lcd4linux.conf.sample lcd4kde.conf lcd4linux.kdelnk lcd4linux.xpm lcd4linux.lsm curses.m4 AUTHORS CREDITS FAQ NEWS TODO README README.Rows README.Tokens README.Drivers README.Plugins README.KDE plugin_sample.c @@ -171,20 +171,20 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar GZIP_ENV = --best -DEP_FILES = .deps/BeckmannEgle.P .deps/HD44780.P .deps/M50530.P \ +DEP_FILES = .deps/BeckmannEgle.P .deps/HD44780.P \ .deps/MilfordInstruments.P .deps/PalmPilot.P .deps/Raster.P .deps/SIN.P \ .deps/T6963.P .deps/Text.P .deps/USBLCD.P .deps/XWindow.P .deps/cfg.P \ .deps/debug.P .deps/drv.P .deps/drv_Crystalfontz.P .deps/drv_Cwlinux.P \ -.deps/drv_MatrixOrbital.P .deps/drv_generic_parport.P \ -.deps/drv_generic_serial.P .deps/drv_generic_text.P .deps/evaluator.P \ -.deps/hash.P .deps/layout.P .deps/lcd4linux.P .deps/lock.P .deps/pid.P \ -.deps/plugin.P .deps/plugin_cfg.P .deps/plugin_cpuinfo.P \ -.deps/plugin_dvb.P .deps/plugin_i2c_sensors.P .deps/plugin_loadavg.P \ -.deps/plugin_math.P .deps/plugin_meminfo.P .deps/plugin_netdev.P \ -.deps/plugin_ppp.P .deps/plugin_proc_stat.P .deps/plugin_string.P \ -.deps/plugin_uname.P .deps/plugin_xmms.P .deps/timer.P .deps/udelay.P \ -.deps/widget.P .deps/widget_bar.P .deps/widget_icon.P \ -.deps/widget_text.P +.deps/drv_M50530.P .deps/drv_MatrixOrbital.P \ +.deps/drv_generic_parport.P .deps/drv_generic_serial.P \ +.deps/drv_generic_text.P .deps/evaluator.P .deps/hash.P .deps/layout.P \ +.deps/lcd4linux.P .deps/lock.P .deps/pid.P .deps/plugin.P \ +.deps/plugin_cfg.P .deps/plugin_cpuinfo.P .deps/plugin_dvb.P \ +.deps/plugin_i2c_sensors.P .deps/plugin_loadavg.P .deps/plugin_math.P \ +.deps/plugin_meminfo.P .deps/plugin_netdev.P .deps/plugin_ppp.P \ +.deps/plugin_proc_stat.P .deps/plugin_string.P .deps/plugin_uname.P \ +.deps/plugin_xmms.P .deps/timer.P .deps/udelay.P .deps/widget.P \ +.deps/widget_bar.P .deps/widget_icon.P .deps/widget_text.P SOURCES = $(lcd4linux_SOURCES) $(EXTRA_lcd4linux_SOURCES) OBJECTS = $(lcd4linux_OBJECTS) diff --git a/aclocal.m4 b/aclocal.m4 index ec6d6e4..50afff6 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -979,7 +979,7 @@ changequote([,]))]) # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # serial 47 AC_PROG_LIBTOOL -# Debian $Rev: 149 $ +# Debian $Rev: 192 $ # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) @@ -1885,13 +1885,6 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], mkdir out printf "$lt_simple_compile_test_code" > conftest.$ac_ext - # According to Tom Tromey, Ian Lance Taylor reported there are C compilers - # that will create temporary files in the current directory regardless of - # the output directory. Thus, making CWD read-only will cause this test - # to fail, enabling locking or at least warning the user not to do parallel - # builds. - chmod -w . - lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -2441,7 +2434,7 @@ netbsd*) finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' dynamic_linker='NetBSD ld.elf_so' fi @@ -3150,7 +3143,7 @@ linux*) lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | knetbsd*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -4144,7 +4137,7 @@ case $host_os in ;; esac ;; - netbsd*) + netbsd* | knetbsd*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' wlarc= @@ -5634,7 +5627,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) ;; esac ;; - netbsd*) + netbsd* | knetbsd*-gnu) ;; osf3* | osf4* | osf5*) case $cc_basename in @@ -6074,7 +6067,7 @@ EOF fi ;; - netbsd*) + netbsd* | knetbsd*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -6491,7 +6484,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd*) + netbsd* | knetbsd*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else diff --git a/configure b/configure index 7f261bc..f210394 100755 --- a/configure +++ b/configure @@ -3929,7 +3929,7 @@ linux*) lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | knetbsd*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else @@ -6232,13 +6232,6 @@ else mkdir out printf "$lt_simple_compile_test_code" > conftest.$ac_ext - # According to Tom Tromey, Ian Lance Taylor reported there are C compilers - # that will create temporary files in the current directory regardless of - # the output directory. Thus, making CWD read-only will cause this test - # to fail, enabling locking or at least warning the user not to do parallel - # builds. - chmod -w . - lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -6248,11 +6241,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6251: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6244: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6255: \$? = $ac_status" >&5 + echo "$as_me:6248: \$? = $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 @@ -6425,7 +6418,7 @@ EOF fi ;; - netbsd*) + netbsd* | knetbsd*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -6942,7 +6935,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi link_all_deplibs=yes ;; - netbsd*) + netbsd* | knetbsd*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -7612,7 +7605,7 @@ netbsd*) finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' dynamic_linker='NetBSD ld.elf_so' fi @@ -8423,7 +8416,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext </dev/null; then archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' wlarc= @@ -10587,7 +10580,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 ;; esac ;; - netbsd*) + netbsd* | knetbsd*-gnu) ;; osf3* | osf4* | osf5*) case $cc_basename in @@ -10698,11 +10691,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10701: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10694: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10705: \$? = $ac_status" >&5 + echo "$as_me:10698: \$? = $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 @@ -10749,13 +10742,6 @@ else mkdir out printf "$lt_simple_compile_test_code" > conftest.$ac_ext - # According to Tom Tromey, Ian Lance Taylor reported there are C compilers - # that will create temporary files in the current directory regardless of - # the output directory. Thus, making CWD read-only will cause this test - # to fail, enabling locking or at least warning the user not to do parallel - # builds. - chmod -w . - lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -10765,11 +10751,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10768: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10754: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10772: \$? = $ac_status" >&5 + echo "$as_me:10758: \$? = $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 @@ -11308,7 +11294,7 @@ netbsd*) finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' dynamic_linker='NetBSD ld.elf_so' fi @@ -12119,7 +12105,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:13033: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13051: \$? = $ac_status" >&5 + echo "$as_me:13037: \$? = $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 @@ -13095,13 +13081,6 @@ else mkdir out printf "$lt_simple_compile_test_code" > conftest.$ac_ext - # According to Tom Tromey, Ian Lance Taylor reported there are C compilers - # that will create temporary files in the current directory regardless of - # the output directory. Thus, making CWD read-only will cause this test - # to fail, enabling locking or at least warning the user not to do parallel - # builds. - chmod -w . - lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -13111,11 +13090,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13114: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13093: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13118: \$? = $ac_status" >&5 + echo "$as_me:13097: \$? = $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 @@ -13288,7 +13267,7 @@ EOF fi ;; - netbsd*) + netbsd* | knetbsd*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -13785,7 +13764,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi link_all_deplibs_F77=yes ;; - netbsd*) + netbsd* | knetbsd*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -14455,7 +14434,7 @@ netbsd*) finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' dynamic_linker='NetBSD ld.elf_so' fi @@ -15143,11 +15122,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15146: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15125: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15150: \$? = $ac_status" >&5 + echo "$as_me:15129: \$? = $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 @@ -15376,11 +15355,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15379: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15358: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15383: \$? = $ac_status" >&5 + echo "$as_me:15362: \$? = $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 @@ -15427,13 +15406,6 @@ else mkdir out printf "$lt_simple_compile_test_code" > conftest.$ac_ext - # According to Tom Tromey, Ian Lance Taylor reported there are C compilers - # that will create temporary files in the current directory regardless of - # the output directory. Thus, making CWD read-only will cause this test - # to fail, enabling locking or at least warning the user not to do parallel - # builds. - chmod -w . - lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -15443,11 +15415,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15446: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15418: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15450: \$? = $ac_status" >&5 + echo "$as_me:15422: \$? = $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 @@ -15620,7 +15592,7 @@ EOF fi ;; - netbsd*) + netbsd* | knetbsd*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -16137,7 +16109,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi link_all_deplibs_GCJ=yes ;; - netbsd*) + netbsd* | knetbsd*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -16807,7 +16779,7 @@ netbsd*) finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' dynamic_linker='NetBSD ld.elf_so' fi @@ -17618,7 +17590,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&6 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 ncurses_version=unknown cat > conftest.$ac_ext < @@ -21013,8 +20985,8 @@ fi if test "$M50530" = "yes"; then PARPORT="yes" -# DRIVERS="$DRIVERS M50530.lo" -# DRIVERS="$DRIVERS M50530.o" +# DRIVERS="$DRIVERS drv_M50530.lo" + DRIVERS="$DRIVERS drv_M50530.o" cat >>confdefs.h <<\_ACEOF #define WITH_M50530 1 diff --git a/configure.in b/configure.in index da2ae23..e069dca 100644 --- a/configure.in +++ b/configure.in @@ -176,8 +176,8 @@ fi if test "$M50530" = "yes"; then PARPORT="yes" -# DRIVERS="$DRIVERS M50530.lo" -# DRIVERS="$DRIVERS M50530.o" +# DRIVERS="$DRIVERS drv_M50530.lo" + DRIVERS="$DRIVERS drv_M50530.o" AC_DEFINE(WITH_M50530,1,[M50530 driver]) fi diff --git a/drv.c b/drv.c index 4016c55..32aa57e 100644 --- a/drv.c +++ b/drv.c @@ -1,4 +1,4 @@ -/* $Id: drv.c,v 1.5 2004/01/27 06:34:14 reinelt Exp $ +/* $Id: drv.c,v 1.6 2004/02/14 11:56:17 reinelt Exp $ * * new framework for display drivers * @@ -23,6 +23,10 @@ * * * $Log: drv.c,v $ + * Revision 1.6 2004/02/14 11:56:17 reinelt + * M50530 driver ported + * changed lots of 'char' to 'unsigned char' + * * Revision 1.5 2004/01/27 06:34:14 reinelt * Cwlinux driver portet to NextGeneration (compiles, but not tested!) * @@ -125,11 +129,11 @@ DRIVER *Driver[] = { #endif #ifdef WITH_HD44780 &drv_HD44780, +#endif +#ifdef WITH_M50530 + &drv_M50530, #endif /* Fixme - #ifdef WITH_M50530 - &M50530, - #endif #ifdef WITH_T6963 &T6963, #endif diff --git a/drv_Crystalfontz.c b/drv_Crystalfontz.c index dfebac8..b1d7a09 100644 --- a/drv_Crystalfontz.c +++ b/drv_Crystalfontz.c @@ -1,4 +1,4 @@ -/* $Id: drv_Crystalfontz.c,v 1.10 2004/02/05 07:10:23 reinelt Exp $ +/* $Id: drv_Crystalfontz.c,v 1.11 2004/02/14 11:56:17 reinelt Exp $ * * new style driver for Crystalfontz display modules * @@ -23,6 +23,10 @@ * * * $Log: drv_Crystalfontz.c,v $ + * Revision 1.11 2004/02/14 11:56:17 reinelt + * M50530 driver ported + * changed lots of 'char' to 'unsigned char' + * * Revision 1.10 2004/02/05 07:10:23 reinelt * evaluator function names are no longer case-sensitive * Crystalfontz Fan PWM control, Fan RPM monitoring, temperature monitoring @@ -315,13 +319,13 @@ static void drv_CF_send (int cmd, int len, char *data) } -static void drv_CF_write1 (char *string, int len) +static void drv_CF_write1 (unsigned char *string, int len) { drv_generic_serial_write (string, len); } -static void drv_CF_write2 (char *string, int len) +static void drv_CF_write2 (unsigned char *string, int len) { // limit length if (Col+len>16) len=16-Col; @@ -337,7 +341,7 @@ static void drv_CF_write2 (char *string, int len) } -static void drv_CF_write3 (char *string, int len) +static void drv_CF_write3 (unsigned char *string, int len) { debug ("write3(<%.*s>,%d)", len, string, len); } @@ -366,7 +370,7 @@ static void drv_CF_goto23 (int row, int col) } -static void drv_CF_defchar1 (int ascii, char *buffer) +static void drv_CF_defchar1 (int ascii, unsigned char *buffer) { char cmd[2]="\031n"; // set custom char bitmap @@ -377,7 +381,7 @@ static void drv_CF_defchar1 (int ascii, char *buffer) } -static void drv_CF_defchar23 (int ascii, char *matrix) +static void drv_CF_defchar23 (int ascii, unsigned char *matrix) { char buffer[9]; diff --git a/drv_Cwlinux.c b/drv_Cwlinux.c index 36251dc..9757069 100644 --- a/drv_Cwlinux.c +++ b/drv_Cwlinux.c @@ -1,4 +1,4 @@ -/* $Id: drv_Cwlinux.c,v 1.2 2004/01/29 04:40:02 reinelt Exp $ +/* $Id: drv_Cwlinux.c,v 1.3 2004/02/14 11:56:17 reinelt Exp $ * * new style driver for Cwlinux display modules * @@ -23,6 +23,10 @@ * * * $Log: drv_Cwlinux.c,v $ + * Revision 1.3 2004/02/14 11:56:17 reinelt + * M50530 driver ported + * changed lots of 'char' to 'unsigned char' + * * Revision 1.2 2004/01/29 04:40:02 reinelt * every .c file includes "config.h" now * @@ -100,7 +104,7 @@ static void drv_CW_goto (int row, int col) } -static void drv_CW1602_defchar (int ascii, char *buffer) +static void drv_CW1602_defchar (int ascii, unsigned char *buffer) { int i; char cmd[12]="\376Nn12345678\375"; @@ -115,7 +119,7 @@ static void drv_CW1602_defchar (int ascii, char *buffer) } -static void drv_CW12232_defchar (int ascii, char *buffer) +static void drv_CW12232_defchar (int ascii, unsigned char *buffer) { int i, j; char cmd[10]="\376Nn123456\375"; diff --git a/drv_HD44780.c b/drv_HD44780.c index 2ec1fd0..ece00c9 100644 --- a/drv_HD44780.c +++ b/drv_HD44780.c @@ -1,4 +1,4 @@ -/* $Id: drv_HD44780.c,v 1.11 2004/02/04 19:10:51 reinelt Exp $ +/* $Id: drv_HD44780.c,v 1.12 2004/02/14 11:56:17 reinelt Exp $ * * new style driver for HD44780-based displays * @@ -29,6 +29,10 @@ * * * $Log: drv_HD44780.c,v $ + * Revision 1.12 2004/02/14 11:56:17 reinelt + * M50530 driver ported + * changed lots of 'char' to 'unsigned char' + * * Revision 1.11 2004/02/04 19:10:51 reinelt * Crystalfontz driver nearly finished * @@ -449,13 +453,13 @@ static void drv_HD_goto (int row, int col) } -static void drv_HD_write (char *string, int len) +static void drv_HD_write (unsigned char *string, int len) { drv_HD_data (currController, string, len, T_EXEC); } -static void drv_HD_defchar (int ascii, char *buffer) +static void drv_HD_defchar (int ascii, unsigned char *buffer) { // define chars on *both* controllers! drv_HD_command (allControllers, 0x40|8*ascii, T_EXEC); @@ -506,7 +510,7 @@ static int drv_HD_start (char *section) char *model, *s; int rows=-1, cols=-1, gpos=-1; - model=cfg_get(section, "Model", NULL); + model=cfg_get(section, "Model", "generic"); if (model!=NULL && *model!='\0') { int i; for (i=0; Models[i].type!=0xff; i++) { @@ -520,7 +524,7 @@ static int drv_HD_start (char *section) Capabilities=Models[Model].capabilities; info ("%s: using model '%s'", Name, Models[Model].name); } else { - error ("%s: no '%s.Model' entry from %s", Name, section, cfg_source()); + error ("%s: empty '%s.Model' entry from %s", Name, section, cfg_source()); return -1; } diff --git a/drv_MatrixOrbital.c b/drv_MatrixOrbital.c index 1eb059d..29e2fd2 100644 --- a/drv_MatrixOrbital.c +++ b/drv_MatrixOrbital.c @@ -1,4 +1,4 @@ -/* $Id: drv_MatrixOrbital.c,v 1.19 2004/01/29 04:40:02 reinelt Exp $ +/* $Id: drv_MatrixOrbital.c,v 1.20 2004/02/14 11:56:17 reinelt Exp $ * * new style driver for Matrix Orbital serial display modules * @@ -23,6 +23,10 @@ * * * $Log: drv_MatrixOrbital.c,v $ + * Revision 1.20 2004/02/14 11:56:17 reinelt + * M50530 driver ported + * changed lots of 'char' to 'unsigned char' + * * Revision 1.19 2004/01/29 04:40:02 reinelt * every .c file includes "config.h" now * @@ -192,7 +196,7 @@ static void drv_MO_goto (int row, int col) } -static void drv_MO_defchar (int ascii, char *buffer) +static void drv_MO_defchar (int ascii, unsigned char *buffer) { char cmd[3]="\376N"; diff --git a/drv_generic_serial.c b/drv_generic_serial.c index 56bbdb8..46c524d 100644 --- a/drv_generic_serial.c +++ b/drv_generic_serial.c @@ -1,4 +1,4 @@ -/* $Id: drv_generic_serial.c,v 1.5 2004/02/04 19:10:51 reinelt Exp $ +/* $Id: drv_generic_serial.c,v 1.6 2004/02/14 11:56:17 reinelt Exp $ * * generic driver helper for serial and usbserial displays * @@ -23,6 +23,10 @@ * * * $Log: drv_generic_serial.c,v $ + * Revision 1.6 2004/02/14 11:56:17 reinelt + * M50530 driver ported + * changed lots of 'char' to 'unsigned char' + * * Revision 1.5 2004/02/04 19:10:51 reinelt * Crystalfontz driver nearly finished * @@ -57,15 +61,15 @@ * int drv_generic_serial_open (char *driver, char *port, speed_t speed); * opens the serial port * - * int drv_generic_serial_poll (char *string, int len) + * int drv_generic_serial_poll (unsigned char *string, int len) * reads from the serial or USB port * without retry * - * int drv_generic_serial_read (char *string, int len); + * int drv_generic_serial_read (unsigned char *string, int len); * reads from the serial or USB port * with retry * - * void drv_generic_serial_write (char *string, int len); + * void drv_generic_serial_write (unsigned char *string, int len); * writes to the serial or USB port * * int drv_generic_serial_close (void); @@ -291,7 +295,7 @@ int drv_generic_serial_open (char *section, char *driver) } -int drv_generic_serial_poll (char *string, int len) +int drv_generic_serial_poll (unsigned char *string, int len) { int ret; if (Device==-1) return -1; @@ -303,7 +307,7 @@ int drv_generic_serial_poll (char *string, int len) } -int drv_generic_serial_read (char *string, int len) +int drv_generic_serial_read (unsigned char *string, int len) { int run, ret; @@ -322,7 +326,7 @@ int drv_generic_serial_read (char *string, int len) } -void drv_generic_serial_write (char *string, int len) +void drv_generic_serial_write (unsigned char *string, int len) { int run, ret; diff --git a/drv_generic_serial.h b/drv_generic_serial.h index 7c87ed1..95a8836 100644 --- a/drv_generic_serial.h +++ b/drv_generic_serial.h @@ -1,4 +1,4 @@ -/* $Id: drv_generic_serial.h,v 1.2 2004/02/01 08:05:12 reinelt Exp $ +/* $Id: drv_generic_serial.h,v 1.3 2004/02/14 11:56:17 reinelt Exp $ * * generic driver helper for serial and usbserial displays * @@ -23,6 +23,10 @@ * * * $Log: drv_generic_serial.h,v $ + * Revision 1.3 2004/02/14 11:56:17 reinelt + * M50530 driver ported + * changed lots of 'char' to 'unsigned char' + * * Revision 1.2 2004/02/01 08:05:12 reinelt * Crystalfontz 633 extensions (CRC checking and stuff) * Models table for HD44780 @@ -53,9 +57,9 @@ #define _DRV_GENERIC_SERIAL_H_ int drv_generic_serial_open (char *section, char *driver); -int drv_generic_serial_poll (char *string, int len); -int drv_generic_serial_read (char *string, int len); -void drv_generic_serial_write (char *string, int len); +int drv_generic_serial_poll (unsigned char *string, int len); +int drv_generic_serial_read (unsigned char *string, int len); +void drv_generic_serial_write (unsigned char *string, int len); int drv_generic_serial_close (void); #endif diff --git a/drv_generic_text.c b/drv_generic_text.c index d05f370..e450ec6 100644 --- a/drv_generic_text.c +++ b/drv_generic_text.c @@ -1,4 +1,4 @@ -/* $Id: drv_generic_text.c,v 1.9 2004/02/07 13:45:23 reinelt Exp $ +/* $Id: drv_generic_text.c,v 1.10 2004/02/14 11:56:17 reinelt Exp $ * * generic driver helper for text-based displays * @@ -23,6 +23,10 @@ * * * $Log: drv_generic_text.c,v $ + * Revision 1.10 2004/02/14 11:56:17 reinelt + * M50530 driver ported + * changed lots of 'char' to 'unsigned char' + * * Revision 1.9 2004/02/07 13:45:23 reinelt * icon visibility patch #2 from Xavier * @@ -244,7 +248,7 @@ int drv_generic_text_icon_draw (WIDGET *W) static int icon_counter=0; WIDGET_ICON *Icon = W->data; int row, col; - char ascii; + unsigned char ascii; row = W->row; col = W->col; @@ -510,7 +514,7 @@ static void drv_generic_text_bar_pack_segments (void) static void drv_generic_text_bar_define_chars(void) { int c, i, j; - char buffer[8]; + unsigned char buffer[8]; for (i=fSegment; i100) - { + if (age<0 || age>100) { parse_i2c_sensors_sysfs(arg); val=hash_get(&I2Csensors, key); } @@ -209,7 +212,7 @@ static int parse_i2c_sensors_procfs(RESULT *arg) running=strdupa(buffer); while(1) { value = strsep (&running, delim); -// debug("%s pos %i -> %s", key, pos , value); + // debug("%s pos %i -> %s", key, pos , value); if (!value) { break; } else { @@ -242,8 +245,7 @@ void my_i2c_sensors_procfs(RESULT *result, int argc, RESULT *argv[]) age=hash_age(&I2Csensors, key, &val); // refresh every 100msec - if (age<0 || age>100) - { + if (age<0 || age>100) { parse_i2c_sensors_procfs(argv[0]); val=hash_get(&I2Csensors, key); } @@ -289,8 +291,9 @@ void my_i2c_sensors_path(char *method) } while((dir = readdir(fd1))) { - // Skip '.' and '..' - if (strcmp(dir->d_name, "." )==0 || + // Skip non-directories and '.' and '..' + if (dir->d_type!=DT_DIR || + strcmp(dir->d_name, "." )==0 || strcmp(dir->d_name, "..")==0) { continue; } @@ -335,7 +338,7 @@ int plugin_init_i2c_sensors (void) } } else { - if (path_cfg[strlen(path_cfg)-1] != '/') { + if (path_cfg[strlen(path_cfg)-1] != '/') { // the headless user forgot the trailing slash :/ debug("adding a trailing slash at the end of the path"); path_cfg = realloc(path_cfg, strlen(path_cfg)+2); @@ -345,17 +348,17 @@ int plugin_init_i2c_sensors (void) debug("if i2c_sensors doesn't work, double check this value !"); path = realloc(path, strlen(path_cfg)+1); strcpy(path, path_cfg); - free(path_cfg); + free(path_cfg); } // we activate the function only if there's a possibly path found if (!path) { - free(path); + free(path); } else { if (!strncmp(path, "/sys", 4)) { - AddFunction ("i2c_sensors", 1, my_i2c_sensors_sysfs); + AddFunction ("i2c_sensors", 1, my_i2c_sensors_sysfs); } else if (!strncmp(path, "/proc", 5)) { - AddFunction ("i2c_sensors", -1, my_i2c_sensors_procfs); + AddFunction ("i2c_sensors", -1, my_i2c_sensors_procfs); } } -- cgit v1.2.3