hamlib-cvs-digest — hamlib commit digest

[Hamlib-cvs-digest] CVS: hamlib/ft847 Makefile.am,1.2,1.3

[Stephane F. <f4...@us...>]

Update of /cvsroot/hamlib/hamlib/ft847
In directory slayer.i.sourceforge.net:/tmp/cvs-serv11858/ft847

Modified Files:
	Makefile.am 
Log Message:
* include missing header files in the distribution

Index: Makefile.am
===================================================================
RCS file: /cvsroot/hamlib/hamlib/ft847/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Makefile.am	2000/10/22 15:55:00	1.2
--- Makefile.am	2000/10/29 10:18:42	1.3
***************
*** 4,5 ****
--- 4,6 ----
  lib_LIBRARIES = libhamlib-ft847.a
  libhamlib_ft847_a_SOURCES = ft847.c
+ noinst_HEADERS = ft847.h

[Hamlib-cvs-digest] CVS: hamlib/ft747 Makefile.am,1.2,1.3

[Stephane F. <f4...@us...>]

Update of /cvsroot/hamlib/hamlib/ft747
In directory slayer.i.sourceforge.net:/tmp/cvs-serv11858/ft747

Modified Files:
	Makefile.am 
Log Message:
* include missing header files in the distribution

Index: Makefile.am
===================================================================
RCS file: /cvsroot/hamlib/hamlib/ft747/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Makefile.am	2000/10/22 15:55:00	1.2
--- Makefile.am	2000/10/29 10:18:41	1.3
***************
*** 4,5 ****
--- 4,6 ----
  lib_LIBRARIES = libhamlib-ft747.a
  libhamlib_ft747_a_SOURCES = ft747.c
+ noinst_HEADERS = ft747.h

[Hamlib-cvs-digest] CVS: hamlib/doc Makefile.am,1.1,1.2

[Stephane F. <f4...@us...>]

Update of /cvsroot/hamlib/hamlib/doc
In directory slayer.i.sourceforge.net:/tmp/cvs-serv11782

Modified Files:
	Makefile.am 
Log Message:
* include scripts in the distribution. I don't know why noinst_SCRIPTS doesn't do it by itself

Index: Makefile.am
===================================================================
RCS file: /cvsroot/hamlib/hamlib/doc/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Makefile.am	2000/10/22 15:48:55	1.1
--- Makefile.am	2000/10/29 10:17:08	1.2
***************
*** 1 ****
! bin_SCRIPTS = hamlib-doc split-man.pl
--- 1,2 ----
! noinst_SCRIPTS = hamlib-doc split-man.pl
! EXTRA_DIST = hamlib-doc split-man.pl

[Hamlib-cvs-digest] CVS: hamlib configure,1.3,1.4 configure.in,1.3,1.4

[Stephane F. <f4...@us...>]

Update of /cvsroot/hamlib/hamlib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv11642

Modified Files:
	configure configure.in 
Log Message:
* Added include paths so 'make distcheck' works

Index: configure
===================================================================
RCS file: /cvsroot/hamlib/hamlib/configure,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** configure	2000/10/09 01:17:19	1.3
--- configure	2000/10/29 10:15:20	1.4
***************
*** 1366,1370 ****
  
  
! INCLUDES="${INCLUDES} -I/usr/local/include -I../src"
  CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE -DV_MAJOR=${V_MAJOR} -DV_MINOR=${V_MINOR}"
  if test "${ac_cv_prog_gcc}" = "yes"; then
--- 1366,1370 ----
  
  
! INCLUDES="${INCLUDES} -I\$(top_srcdir)/include -I\$(top_srcdir)/src"
  CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE -DV_MAJOR=${V_MAJOR} -DV_MINOR=${V_MINOR}"
  if test "${ac_cv_prog_gcc}" = "yes"; then
***************
*** 1529,1533 ****
  
  /* Ultrix mips cc rejects this.  */
! typedef int charset[2]; const charset x;
  /* SunOS 4.1.1 cc rejects this.  */
  char const *const *ccp;
--- 1529,1533 ----
  
  /* Ultrix mips cc rejects this.  */
! typedef int charset[2]; const charset x = {0,0};
  /* SunOS 4.1.1 cc rejects this.  */
  char const *const *ccp;
***************
*** 1604,1608 ****
  
  int main() {
! } $ac_kw foo() {
  ; return 0; }
  EOF
--- 1604,1608 ----
  
  int main() {
! } int $ac_kw foo() {
  ; return 0; }
  EOF
***************
*** 2036,2039 ****
--- 2036,2040 ----
  
  
+ 
  # Check whether --enable-shared or --disable-shared was given.
  if test "${enable_shared+set}" = set; then
***************
*** 2112,2116 ****
  
  echo $ac_n "checking host system type""... $ac_c" 1>&6
! echo "configure:2115: checking host system type" >&5
  
  host_alias=$host
--- 2113,2117 ----
  
  echo $ac_n "checking host system type""... $ac_c" 1>&6
! echo "configure:2116: checking host system type" >&5
  
  host_alias=$host
***************
*** 2133,2137 ****
  
  echo $ac_n "checking build system type""... $ac_c" 1>&6
! echo "configure:2136: checking build system type" >&5
  
  build_alias=$build
--- 2134,2138 ----
  
  echo $ac_n "checking build system type""... $ac_c" 1>&6
! echo "configure:2137: checking build system type" >&5
  
  build_alias=$build
***************
*** 2153,2157 ****
  set dummy ranlib; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:2156: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 2154,2158 ----
  set dummy ranlib; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:2157: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 2192,2196 ****
    # Check if gcc -print-prog-name=ld gives a path.
    echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
! echo "configure:2195: checking for ld used by GCC" >&5
    ac_prog=`($CC -print-prog-name=ld) 2>&5`
    case "$ac_prog" in
--- 2193,2197 ----
    # Check if gcc -print-prog-name=ld gives a path.
    echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
! echo "configure:2196: checking for ld used by GCC" >&5
    ac_prog=`($CC -print-prog-name=ld) 2>&5`
    case "$ac_prog" in
***************
*** 2216,2223 ****
  elif test "$with_gnu_ld" = yes; then
    echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
! echo "configure:2219: checking for GNU ld" >&5
  else
    echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
! echo "configure:2222: checking for non-GNU ld" >&5
  fi
  if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
--- 2217,2224 ----
  elif test "$with_gnu_ld" = yes; then
    echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
! echo "configure:2220: checking for GNU ld" >&5
  else
    echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
! echo "configure:2223: checking for non-GNU ld" >&5
  fi
  if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
***************
*** 2253,2257 ****
  fi
  test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
- 
  echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
  echo "configure:2258: checking if the linker ($LD) is GNU ld" >&5
--- 2254,2257 ----
***************
*** 2307,2318 ****
  
  
  
  # Check for any special flags to pass to ltconfig.
! #
! # the following will cause an existing older ltconfig to fail, so
! # we ignore this at the expense of the cache file... Checking this 
! # will just take longer ... bummer!
! #libtool_flags="--cache-file=$cache_file"
! #
  test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
  test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
--- 2307,2317 ----
  
  
+ case "$target" in
+ NONE) lt_target="$host" ;;
+ *) lt_target="$target" ;;
+ esac
  
  # Check for any special flags to pass to ltconfig.
! libtool_flags="--cache-file=$cache_file"
  test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
  test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
***************
*** 2320,2324 ****
  test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
  test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
! 
  
  # Check whether --enable-libtool-lock or --disable-libtool-lock was given.
--- 2319,2323 ----
  test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
  test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
! libtool_flags="$libtool_flags --enable-dlopen"
  
  # Check whether --enable-libtool-lock or --disable-libtool-lock was given.
***************
*** 2333,2341 ****
  # Some flags need to be propagated to the compiler or linker for good
  # libtool support.
! case "$host" in
  *-*-irix6*)
    # Find out which ABI we are using.
!   echo '#line 2339 "configure"' > conftest.$ac_ext
!   if { (eval echo configure:2340: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
      case "`/usr/bin/file conftest.o`" in
      *32-bit*)
--- 2332,2340 ----
  # Some flags need to be propagated to the compiler or linker for good
  # libtool support.
! case "$lt_target" in
  *-*-irix6*)
    # Find out which ABI we are using.
!   echo '#line 2338 "configure"' > conftest.$ac_ext
!   if { (eval echo configure:2339: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
      case "`/usr/bin/file conftest.o`" in
      *32-bit*)
***************
*** 2358,2367 ****
    CFLAGS="$CFLAGS -belf"
    echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
! echo "configure:2361: checking whether the C compiler needs -belf" >&5
  if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2366 "configure"
  #include "confdefs.h"
  
--- 2357,2366 ----
    CFLAGS="$CFLAGS -belf"
    echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
! echo "configure:2360: checking whether the C compiler needs -belf" >&5
  if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2365 "configure"
  #include "confdefs.h"
  
***************
*** 2370,2374 ****
  ; return 0; }
  EOF
! if { (eval echo configure:2373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    lt_cv_cc_needs_belf=yes
--- 2369,2373 ----
  ; return 0; }
  EOF
! if { (eval echo configure:2372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    lt_cv_cc_needs_belf=yes
***************
*** 2448,2452 ****
  DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
  ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
! $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
  || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
  
--- 2447,2451 ----
  DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
  ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
! $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
  || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
  
***************
*** 2477,2491 ****
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:2480: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2485 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:2490: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
--- 2476,2490 ----
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:2479: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2484 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:2489: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
***************
*** 2508,2512 ****
  EOF
   echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
! echo "configure:2511: checking for dlopen in -ldl" >&5
  ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--- 2507,2511 ----
  EOF
   echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
! echo "configure:2510: checking for dlopen in -ldl" >&5
  ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
***************
*** 2516,2520 ****
  LIBS="-ldl  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 2519 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
--- 2515,2519 ----
  LIBS="-ldl  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 2518 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
***************
*** 2527,2531 ****
  ; return 0; }
  EOF
! if { (eval echo configure:2530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
--- 2526,2530 ----
  ; return 0; }
  EOF
! if { (eval echo configure:2529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
***************
*** 2557,2566 ****
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2560: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2565 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
--- 2556,2565 ----
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2559: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2564 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
***************
*** 2585,2589 ****
  ; return 0; }
  EOF
! if { (eval echo configure:2588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
--- 2584,2588 ----
  ; return 0; }
  EOF
! if { (eval echo configure:2587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
***************
*** 2744,2748 ****
  
  trap 'rm -fr `echo "ft747/Makefile ft847/Makefile icom/Makefile Makefile \
! 			src/Makefile tests/Makefile  include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
  EOF
  cat >> $CONFIG_STATUS <<EOF
--- 2743,2748 ----
  
  trap 'rm -fr `echo "ft747/Makefile ft847/Makefile icom/Makefile Makefile \
! 			include/Makefile include/hamlib/Makefile src/Makefile \
! 			tests/Makefile doc/Makefile  include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
  EOF
  cat >> $CONFIG_STATUS <<EOF
***************
*** 2801,2806 ****
  s%@build_os@%$build_os%g
  s%@RANLIB@%$RANLIB%g
- s%@LD@%$LD%g
- s%@NM@%$NM%g
  s%@LIBTOOL@%$LIBTOOL%g
  s%@INCLUDES@%$INCLUDES%g
--- 2801,2804 ----
***************
*** 2851,2855 ****
  
  CONFIG_FILES=\${CONFIG_FILES-"ft747/Makefile ft847/Makefile icom/Makefile Makefile \
! 			src/Makefile tests/Makefile "}
  EOF
  cat >> $CONFIG_STATUS <<\EOF
--- 2849,2854 ----
  
  CONFIG_FILES=\${CONFIG_FILES-"ft747/Makefile ft847/Makefile icom/Makefile Makefile \
! 			include/Makefile include/hamlib/Makefile src/Makefile \
! 			tests/Makefile doc/Makefile "}
  EOF
  cat >> $CONFIG_STATUS <<\EOF

Index: configure.in
===================================================================
RCS file: /cvsroot/hamlib/hamlib/configure.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** configure.in	2000/10/22 15:53:12	1.3
--- configure.in	2000/10/29 10:15:20	1.4
***************
*** 20,24 ****
  AC_ISC_POSIX
  
! INCLUDES="${INCLUDES} -I/usr/local/include -I../src"
  CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE -DV_MAJOR=${V_MAJOR} -DV_MINOR=${V_MINOR}"
  if test "${ac_cv_prog_gcc}" = "yes"; then
--- 20,24 ----
  AC_ISC_POSIX
  
! INCLUDES="${INCLUDES} -I\$(top_srcdir)/include -I\$(top_srcdir)/src"
  CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE -DV_MAJOR=${V_MAJOR} -DV_MINOR=${V_MINOR}"
  if test "${ac_cv_prog_gcc}" = "yes"; then

[Hamlib-cvs-digest] CVS: hamlib/tests Makefile.am,1.3,1.4

[Stephane F. <f4...@us...>]

Update of /cvsroot/hamlib/hamlib/tests
In directory slayer.i.sourceforge.net:/tmp/cvs-serv23192

Modified Files:
	Makefile.am 
Log Message:
byebye LD_LIBRARY_PATH, hello unreadability :)

Index: Makefile.am
===================================================================
RCS file: /cvsroot/hamlib/hamlib/tests/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Makefile.am	2000/10/22 16:13:29	1.3
--- Makefile.am	2000/10/23 19:59:45	1.4
***************
*** 2,5 ****
--- 2,12 ----
  LDADD = ../src/libhamlib.la
  listrigs_LDADD = ../src/libhamlib.la "-dlopen" ../icom/libhamlib-icom.la "-dlopen" ../ft747/libhamlib-ft747.la "-dlopen" ../ft847/libhamlib-ft847.la
+ dumpcaps_LDADD = ../src/libhamlib.la "-dlopen" ../icom/libhamlib-icom.la "-dlopen" ../ft747/libhamlib-ft747.la "-dlopen" ../ft847/libhamlib-ft847.la
+ testrig_LDADD = ../src/libhamlib.la "-dlopen" ../icom/libhamlib-icom.la "-dlopen" ../ft747/libhamlib-ft747.la "-dlopen" ../ft847/libhamlib-ft847.la
+ testtrn_LDADD = ../src/libhamlib.la "-dlopen" ../icom/libhamlib-icom.la "-dlopen" ../ft747/libhamlib-ft747.la "-dlopen" ../ft847/libhamlib-ft847.la
+ listrigs_DEPENDENCIES = ../icom/libhamlib-icom.la ../ft747/libhamlib-ft747.la ../ft847/libhamlib-ft847.la
+ dumpcaps_DEPENDENCIES = ../icom/libhamlib-icom.la ../ft747/libhamlib-ft747.la ../ft847/libhamlib-ft847.la
+ testrig_DEPENDENCIES = ../icom/libhamlib-icom.la ../ft747/libhamlib-ft747.la ../ft847/libhamlib-ft847.la
+ testtrn_DEPENDENCIES = ../icom/libhamlib-icom.la ../ft747/libhamlib-ft747.la ../ft847/libhamlib-ft847.la
  listrigs_DEPENDENCIES = ../icom/libhamlib-icom.la ../ft747/libhamlib-ft747.la ../ft847/libhamlib-ft847.la
  testrig_SOURCES = testrig.c

[Hamlib-cvs-digest] CVS: hamlib/src serial.c,1.3,1.4

[Stephane F. <f4...@us...>]

Update of /cvsroot/hamlib/hamlib/src
In directory slayer.i.sourceforge.net:/tmp/cvs-serv22971

Modified Files:
	serial.c 
Log Message:
* coded in a solution to not have active post_write_delay wait loop


Index: serial.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/src/serial.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** serial.c	2000/10/09 01:17:20	1.3
--- serial.c	2000/10/23 19:58:14	1.4
***************
*** 323,326 ****
--- 323,328 ----
   * count - count of byte to send from the txbuffer
   * write_delay - write delay in ms between 2 chars
+  * post_write_delay - minimum delay between two writes
+  * post_write_date - timeval of last write
   *
   * returns:
***************
*** 333,344 ****
   */
  
! int write_block(int fd, const unsigned char *txbuffer, size_t count, int write_delay, int post_write_delay)
  {
    int i;
  
    if (write_delay > 0) {
    	for (i=0; i < count; i++) {
  		if (write(fd, txbuffer+i, 1) < 0) {
! 			rig_debug(RIG_DEBUG_ERR,"write_block() failed - %s\n", strerror(errno));
  			return -RIG_EIO;
      	}
--- 335,367 ----
   */
  
! int write_block(int fd, const unsigned char *txbuffer, size_t count, int write_delay, int post_write_delay /* , struct timeval *post_write_date */ )
  {
    int i;
  
+ #ifdef WANT_NON_ACTIVE_POST_WRITE_DELAY
+   if (post_write_date->tv_sec != 0) {
+ 		  signed int date_delay;	/* in us */
+ 		  struct timeval tv;
+ 
+ 		  /* FIXME in Y2038 ... */
+ 		  gettimeofday(tv, NULL);
+ 		  date_delay = post_write_delay*1000 - 
+ 				  		((tv.tv_sec - post_write_date->tv_sec)*1000000 +
+ 				  		 (tv.tv_usec - post_write_date->tv_usec));
+ 		  if (date_delay > 0) {
+ 				/*
+ 				 * optional delay after last write 
+ 				 */
+ 				usleep(date_delay); 
+ 		  }
+ 		  post_write_date->tv_sec = 0;
+   }
+ #endif
+ 
    if (write_delay > 0) {
    	for (i=0; i < count; i++) {
  		if (write(fd, txbuffer+i, 1) < 0) {
! 			rig_debug(RIG_DEBUG_ERR,"write_block() failed - %s\n", 
! 							strerror(errno));
  			return -RIG_EIO;
      	}
***************
*** 349,357 ****
    }
    
!   if(post_write_delay > 0)
      usleep(post_write_delay*1000); /* optional delay after last write */
  				   /* otherwise some yaesu rigs get confused */
  				   /* with sequential fast writes*/
! 
    rig_debug(RIG_DEBUG_TRACE,"TX %d bytes\n",count);
    dump_hex(txbuffer,count);
--- 372,387 ----
    }
    
!   if (post_write_delay > 0) {
! #ifdef WANT_NON_ACTIVE_POST_WRITE_DELAY
! #define POST_WRITE_DELAY_TRSHLD 10
! 
! 	if (post_write_delay > POST_WRITE_DELAY_TRSHLD)
! 		gettimeofday(post_write_date, NULL);
! 	else
! #endif
      usleep(post_write_delay*1000); /* optional delay after last write */
  				   /* otherwise some yaesu rigs get confused */
  				   /* with sequential fast writes*/
!   }
    rig_debug(RIG_DEBUG_TRACE,"TX %d bytes\n",count);
    dump_hex(txbuffer,count);

[Hamlib-cvs-digest] CVS: hamlib/src rig.c,1.6,1.7

[Stephane F. <f4...@us...>]

Update of /cvsroot/hamlib/hamlib/src
In directory slayer.i.sourceforge.net:/tmp/cvs-serv22726

Modified Files:
	rig.c 
Log Message:
* misc comments update about CTCSS & DCS


Index: rig.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/src/rig.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** rig.c	2000/10/22 16:08:23	1.6
--- rig.c	2000/10/23 19:56:29	1.7
***************
*** 940,944 ****
   *      @tone:	The tone to set to
   *
!  *      The rig_set_ctcss() function sets the current squelch tone.
   *      NB, @tone is NOT in Hz, but in tenth of Hz! This way,
   *      if you want to set subaudible tone of 88.5 Hz for example,
--- 940,945 ----
   *      @tone:	The tone to set to
   *
!  *      The rig_set_ctcss() function sets the current Continuous Tone
!  *      Controlled Squelch System (CTCSS) sub-audible tone.
   *      NB, @tone is NOT in Hz, but in tenth of Hz! This way,
   *      if you want to set subaudible tone of 88.5 Hz for example,
***************
*** 974,979 ****
   *      @tone:	The location where to store the current tone
   *
!  *      The rig_get_ctcss() function retrieves the current 
!  *      squelch tone.
   *      NB, @tone is NOT in Hz, but in tenth of Hz! This way,
   *      if the function rig_get_ctcss() returns a subaudible tone of 885
--- 975,980 ----
   *      @tone:	The location where to store the current tone
   *
!  *      The rig_get_ctcss() function retrieves the current Continuous Tone
!  *      Controlled Squelch System (CTCSS) sub-audible tone.
   *      NB, @tone is NOT in Hz, but in tenth of Hz! This way,
   *      if the function rig_get_ctcss() returns a subaudible tone of 885
***************
*** 1001,1012 ****
   *      rig_set_dcs - set the current DCS
   *      @rig:	The rig handle
!  *      @tone:	The tone to set to
   *
!  *      The rig_set_dcs() function sets the current subaudible tone to 
!  *      access a repeater or tone squelched frequency.
!  *      NB, @tone is NOT in Hz, but in tenth of Hz! This way,
!  *      if you want to set subaudible tone of 88.5 Hz for example,
!  *      then pass 885 to this function. Also, to disable Tone squelch,
!  *      set @tone to 0.
   *
   *      RETURN VALUE: The rig_set_dcs() function returns %RIG_OK
--- 1002,1009 ----
   *      rig_set_dcs - set the current DCS
   *      @rig:	The rig handle
!  *      @code:	The tone to set to
   *
!  *      The rig_set_dcs() function sets the current Digitally-Coded Squelch
!  *      code.
   *
   *      RETURN VALUE: The rig_set_dcs() function returns %RIG_OK
***************
*** 1017,1021 ****
   */
  
! int rig_set_dcs(RIG *rig, unsigned int tone)
  {
  		if (!rig || !rig->caps)
--- 1014,1018 ----
   */
  
! int rig_set_dcs(RIG *rig, unsigned int code)
  {
  		if (!rig || !rig->caps)
***************
*** 1025,1029 ****
  			return -RIG_ENAVAIL;	/* not implemented */
  		else
! 			return rig->caps->set_dcs(rig, tone);
  }
  
--- 1022,1026 ----
  			return -RIG_ENAVAIL;	/* not implemented */
  		else
! 			return rig->caps->set_dcs(rig, code);
  }
  
***************
*** 1031,1041 ****
   *      rig_get_dcs - get the current DCS
   *      @rig:	The rig handle
!  *      @tone:	The location where to store the current tone
   *
!  *      The rig_get_dcs() function retrieves the current DCS. 
!  *      NB, @tone is NOT in Hz, but in tenth of Hz! This way,
!  *      if the function rig_get_dcs() returns a subaudible tone of 885
!  *      for example, then the real tone is 88.5 Hz. 
!  *      Also, a value of 0 for @tone means the Tone encoding is disabled.
   *
   *      RETURN VALUE: The rig_get_dcs() function returns %RIG_OK
--- 1028,1035 ----
   *      rig_get_dcs - get the current DCS
   *      @rig:	The rig handle
!  *      @code:	The location where to store the current tone
   *
!  *      The rig_get_dcs() function retrieves the current 
!  *      Digitally-Coded Squelch. 
   *
   *      RETURN VALUE: The rig_get_dcs() function returns %RIG_OK
***************
*** 1045,1051 ****
   *      SEE ALSO: rig_get_dcs(), rig_set_ctcss(), rig_get_ctcss()
   */
! int rig_get_dcs(RIG *rig, unsigned int *tone)
  {
! 		if (!rig || !rig->caps || !tone)
  			return -RIG_EINVAL;
  
--- 1039,1045 ----
   *      SEE ALSO: rig_get_dcs(), rig_set_ctcss(), rig_get_ctcss()
   */
! int rig_get_dcs(RIG *rig, unsigned int *code)
  {
! 		if (!rig || !rig->caps || !code)
  			return -RIG_EINVAL;
  
***************
*** 1053,1057 ****
  			return -RIG_ENAVAIL;	/* not implemented */
  		else
! 			return rig->caps->get_dcs(rig, tone);
  }
  
--- 1047,1051 ----
  			return -RIG_ENAVAIL;	/* not implemented */
  		else
! 			return rig->caps->get_dcs(rig, code);
  }
  
***************
*** 1188,1192 ****
  			return -RIG_ENAVAIL;	/* not implemented */
  		else
! 			return rig->caps->get_level(rig, set, val);
  }
  
--- 1182,1186 ----
  			return -RIG_ENAVAIL;	/* not implemented */
  		else
! 			return rig->caps->get_level(rig, level, val);
  }
  

[Hamlib-cvs-digest] CVS: hamlib/include/hamlib riglist.h,1.3,1.4

[Stephane F. <f4...@us...>]

Update of /cvsroot/hamlib/hamlib/include/hamlib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv22460

Modified Files:
	riglist.h 
Log Message:
* try to be more exhaustive in the rig list. Any volounteers ?
* cleanup


Index: riglist.h
===================================================================
RCS file: /cvsroot/hamlib/hamlib/include/hamlib/riglist.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** riglist.h	2000/10/16 21:48:48	1.3
--- riglist.h	2000/10/23 19:55:11	1.4
***************
*** 29,43 ****
  
  enum rig_model_e {
  	RIG_MODEL_FT847 = 0,
  	RIG_MODEL_FT1000,
  	RIG_MODEL_FT1000D,
  	RIG_MODEL_FT747,
  	RIG_MODEL_FT840,
  	RIG_MODEL_FT920,
! 
  	RIG_MODEL_TS570D,
  	RIG_MODEL_TS870S,
  	RIG_MODEL_TS950,
! 
  	RIG_MODEL_IC1271,
  	RIG_MODEL_IC1275,
--- 29,74 ----
  
  enum rig_model_e {
+ 	/*
+ 	 * Yeasu 
+ 	 */
  	RIG_MODEL_FT847 = 0,
  	RIG_MODEL_FT1000,
  	RIG_MODEL_FT1000D,
+ 	RIG_MODEL_FT1000MP,
  	RIG_MODEL_FT747,
+ 	RIG_MODEL_FT757,
+ 	RIG_MODEL_FT757GXII,
+ 	RIG_MODEL_FT575,
+ 	RIG_MODEL_FT767,
+ 	RIG_MODEL_FT736R,
  	RIG_MODEL_FT840,
+ 	RIG_MODEL_FT820,
  	RIG_MODEL_FT920,
! 	RIG_MODEL_FT890,
! 	RIG_MODEL_FT990,
! 	RIG_MODEL_FRG100,	/* same as FT890/990 ? */
! 	RIG_MODEL_FRG9600,
! 	RIG_MODEL_FRG8800,
! 
! 	/*
! 	 * Kenwood
! 	 */
  	RIG_MODEL_TS570D,
  	RIG_MODEL_TS870S,
+ 	RIG_MODEL_TS850,
  	RIG_MODEL_TS950,
! 	RIG_MODEL_TS711,
! 	RIG_MODEL_TS811,
! 	RIG_MODEL_TS940,
! 	RIG_MODEL_TS440,
! 	RIG_MODEL_TSR5000,
! 	RIG_MODEL_TS450S,
! 	RIG_MODEL_TS690S,
! 	RIG_MODEL_TS950SDX,
! 	RIG_MODEL_TS50,
! 
! 	/*
! 	 * Icom
! 	 */
  	RIG_MODEL_IC1271,
  	RIG_MODEL_IC1275,
***************
*** 75,80 ****
  	RIG_MODEL_IC821H,
  	RIG_MODEL_IC970,
- 	RIG_MODEL_ICR71,
  	RIG_MODEL_ICR10,
  	RIG_MODEL_ICR72,
  	RIG_MODEL_ICR75,
--- 106,111 ----
  	RIG_MODEL_IC821H,
  	RIG_MODEL_IC970,
  	RIG_MODEL_ICR10,
+ 	RIG_MODEL_ICR71,
  	RIG_MODEL_ICR72,
  	RIG_MODEL_ICR75,
***************
*** 84,89 ****
  	RIG_MODEL_ICR9000,
  	RIG_MODEL_PCR1000,
! 	RIG_MODEL_MINISCOUT
  
  	/* etc. */
  };
--- 115,210 ----
  	RIG_MODEL_ICR9000,
  	RIG_MODEL_PCR1000,
! 	RIG_MODEL_PCR100,
  
+ 	/*
+ 	 * Optoelectronics
+ 	 */
+ 	RIG_MODEL_MINISCOUT,
+ 	RIG_MODEL_XPLORER,
+ 
+ 	/*
+ 	 * AOR
+ 	 */
+ 	RIG_MODEL_AR8200,
+ 	RIG_MODEL_AR8000,
+ 	RIG_MODEL_AR7030,
+ 	RIG_MODEL_AR5000,
+ 	RIG_MODEL_AR3030,
+ 	RIG_MODEL_AR3000A,
+ 	RIG_MODEL_AR3000,
+ 	RIG_MODEL_AR2700,
+ 	RIG_MODEL_AR2500,
+ 	RIG_MODEL_AR16,
+ 
+ 	/*
+ 	 * JRC
+ 	 */
+ 	RIG_MODEL_JST245,
+ 	RIG_MODEL_CMH530,
+ 	RIG_MODEL_NRD345,
+ 	RIG_MODEL_NRD525,
+ 	RIG_MODEL_NRD535,
+ 	RIG_MODEL_NRD545,
+ 
+ 	/*
+ 	 * Radio Shack
+ 	 */
+ 	RIG_MODEL_RS64,		/* PRO-64 */
+ 	RIG_MODEL_RS2005,	/* w/ OptoElectronics OS456 Board */
+ 	RIG_MODEL_RS2006,	/* w/ OptoElectronics OS456 Board */
+ 	RIG_MODEL_RS2035,	/* w/ OptoElectronics OS435 Board */
+ 	RIG_MODEL_RS2042,	/* w/ OptoElectronics OS435 Board */
+ 	RIG_MODEL_RS2041,	/* PRO-2041 */
+ 	RIG_MODEL_RS2052,	/* PRO-2052 */
+ 
+ 	/*
+ 	 * Uniden
+ 	 */
+ 	RIG_MODEL_BC780,	/* Uniden BC780 - Trunk Tracker "Desktop Radio" */
+ 	RIG_MODEL_BC245,
+ 	RIG_MODEL_BC895,
+ 
+ 	/*
+ 	 * Drake
+ 	 */
+ 	RIG_MODEL_DKR8,
+ 	RIG_MODEL_DKR8A,
+ 
+ 	/*
+ 	 * Lowe
+ 	 */
+ 	RIG_MODEL_HF150,
+ 	RIG_MODEL_HF250,
+ 
+ 	/*
+ 	 * Racal
+ 	 */
+ 	RIG_MODEL_RA3790,
+ 	RIG_MODEL_RA3720,
+ 
+ 	/*
+ 	 * Watkins-Johnson
+ 	 */
+ 	RIG_MODEL_HF1000,
+ 	RIG_MODEL_HF1000A,
+ 	RIG_MODEL_WJ8711,
+ 
+ 	/*
+ 	 * Rohde & Schwarz
+ 	 */
+ 	RIG_MODEL_ESM500,
+ 	RIG_MODEL_EK890,
+ 	RIG_MODEL_EK891,
+ 	RIG_MODEL_EK895,
+ 	RIG_MODEL_EK070,
+ 
+ 	RIG_MODEL_KWZ30,	/* KNEISNER +DOERING */
+ 	RIG_MODEL_E1800,	/* DASA-Telefunken */
+ 	RIG_MODEL_EKD500,	/* RFT */
+ 	RIG_MODEL_WINRADIO,	/* Rosetta */
+ 	RIG_MODEL_TT550,	/* Ten Tec */
+ 	RIG_MODEL_RX320,
+ 
+ 
  	/* etc. */
  };
***************
*** 91,113 ****
  typedef enum rig_model_e rig_model_t;
  
- /*
-  * It would be nice to have an automatic way of referencing all the backends
-  * supported by hamlib. Maybe this array should be placed in a separate file..
-  */
- #if 0
- extern const struct rig_caps ft747_caps;
- extern const struct rig_caps ft847_caps;
- extern const struct rig_caps ic706_caps;
- extern const struct rig_caps ic706mkiig_caps;
- extern const struct rig_caps ft747_caps;
- 
- #endif
- /* etc. */
  
- 
  #endif /* _RIGLIST_H */
- 
- 
- 
- 
- 
--- 212,215 ----

[Hamlib-cvs-digest] CVS: hamlib/include/hamlib rig.h,1.5,1.6

[Stephane F. <f4...@us...>]

Update of /cvsroot/hamlib/hamlib/include/hamlib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv22294

Modified Files:
	rig.h 
Log Message:
* added rig_set_bank() to the API
* added struct timeval post_write_date to rig_state, so the post_write_delay
  may not be an active wait loop.
* cleanup


Index: rig.h
===================================================================
RCS file: /cvsroot/hamlib/hamlib/include/hamlib/rig.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** rig.h	2000/10/22 16:02:21	1.5
--- rig.h	2000/10/23 19:53:03	1.6
***************
*** 30,33 ****
--- 30,34 ----
  #include <hamlib/riglist.h>	/* list in another file to not mess up w/ this one */
  #include <stdio.h>		/* required for FILE definition */
+ #include <sys/time.h>		/* required for struct timeval */
  
  /*
***************
*** 453,460 ****
    int (*get_ts)(RIG *rig, unsigned long *ts); /* get tuning step */
  
!   int (*set_dcs)(RIG *rig, unsigned int tone);	/* set tone */
!   int (*get_dcs)(RIG *rig, unsigned int *tone);	/* get tone */
!   int (*set_ctcss)(RIG *rig, unsigned int tone);	/* set tone squelch */
!   int (*get_ctcss)(RIG *rig, unsigned int *tone);	/* get tone squelch */
  
    /*
--- 454,461 ----
    int (*get_ts)(RIG *rig, unsigned long *ts); /* get tuning step */
  
!   int (*set_dcs)(RIG *rig, unsigned int code);
!   int (*get_dcs)(RIG *rig, unsigned int *code);
!   int (*set_ctcss)(RIG *rig, unsigned int tone);
!   int (*get_ctcss)(RIG *rig, unsigned int *tone);
  
    /*
***************
*** 476,479 ****
--- 477,481 ----
    int (*get_func)(RIG *rig, setting_t *func); /* get the setting from rig */
  
+   int (*set_bank)(RIG *rig, int bank);			/* set memory bank number */
    int (*set_mem)(RIG *rig, int ch);			/* set memory channel number */
    int (*get_mem)(RIG *rig, int *ch);		/* get memory channel number */
***************
*** 515,518 ****
--- 517,521 ----
    int write_delay;        /* delay in ms between each byte sent out */
    int post_write_delay;		/* for some yaesu rigs */
+   struct timeval post_write_date;		/* hamlib internal use */
    int timeout;	/* in ms */
    int retry;		/* maximum number of retries, 0 to disable */
***************
*** 597,602 ****
  extern int rig_set_ctcss(RIG *rig, unsigned int tone);
  extern int rig_get_ctcss(RIG *rig, unsigned int *tone);
! extern int rig_set_dcs(RIG *rig, unsigned int tone);
! extern int rig_get_dcs(RIG *rig, unsigned int *tone);
  
  extern int rig_set_split_freq(RIG *rig, freq_t rx_freq, freq_t tx_freq);
--- 600,605 ----
  extern int rig_set_ctcss(RIG *rig, unsigned int tone);
  extern int rig_get_ctcss(RIG *rig, unsigned int *tone);
! extern int rig_set_dcs(RIG *rig, unsigned int code);
! extern int rig_get_dcs(RIG *rig, unsigned int *code);
  
  extern int rig_set_split_freq(RIG *rig, freq_t rx_freq, freq_t tx_freq);
***************
*** 613,636 ****
  extern int rig_mW2power(RIG *rig, float *power, unsigned int mwpower, freq_t freq, rmode_t mode);
  
- #if 0
- extern int rig_set_volume(RIG *rig, float vol);
- extern int rig_get_volume(RIG *rig, float *vol);
- extern int rig_set_squelch(RIG *rig, float sql);
- extern int rig_get_squelch(RIG *rig, float *sql);
- extern int rig_get_squelch_status(RIG *rig, int *sql_status);
- extern int rig_get_strength(RIG *rig, int *strength);
- extern int rig_set_ant(RIG *rig, int ant);
- extern int rig_get_ant(RIG *rig, int *ant);
- extern int rig_set_att(RIG *rig, int att);
- extern int rig_get_att(RIG *rig, int *att);
- extern int rig_set_preamp(RIG *rig, int preamp);
- extern int rig_get_preamp(RIG *rig, int *preamp);
- #else
- 
  extern int rig_set_level(RIG *rig, setting_t level, value_t val);
  extern int rig_get_level(RIG *rig, setting_t level, value_t *val);
  
  #define rig_get_strength(r,s) rig_get_level((r), RIG_LEVEL_STRENGTH, (value_t*)(s))
- #endif
  
  extern int rig_set_poweron(RIG *rig);
--- 616,623 ----
***************
*** 651,654 ****
--- 638,642 ----
  extern int rig_get_func(RIG *rig, setting_t *func); /* get the setting from rig */
  
+ extern int rig_set_bank(RIG *rig, int bank);	/* set memory bank number */
  extern int rig_set_mem(RIG *rig, int ch);		/* set memory channel number */
  extern int rig_get_mem(RIG *rig, int *ch);		/* get memory channel number */

[Hamlib-cvs-digest] CVS: hamlib/icom ic706.c,1.6,1.7 icom.h,1.6,1.7 icom.c,1.7,1.8 icom_defs.h,1.4,1.5

[Stephane F. <f4...@us...>]

Update of /cvsroot/hamlib/hamlib/icom
In directory slayer.i.sourceforge.net:/tmp/cvs-serv21781

Modified Files:
	ic706.c icom.h icom.c icom_defs.h 
Log Message:
* Added some more capabilities

Index: ic706.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/icom/ic706.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** ic706.c	2000/10/16 22:32:36	1.6
--- ic706.c	2000/10/23 19:48:12	1.7
***************
*** 214,217 ****
--- 214,225 ----
  set_channel: icom_set_channel,
  get_channel: icom_get_channel,
+ set_mem: icom_set_mem,
+ mv_ctl: icom_mv_ctl,
+ set_ptt: icom_set_ptt,
+ get_ptt: icom_get_ptt,
+ set_ts: icom_set_ts,
+ get_ts: icom_get_ts,
+ set_rptr_shift: icom_set_rptr_shift,
+ get_rptr_shift: icom_get_rptr_shift,
  };
  

Index: icom.h
===================================================================
RCS file: /cvsroot/hamlib/hamlib/icom/icom.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** icom.h	2000/10/16 22:35:57	1.6
--- icom.h	2000/10/23 19:48:12	1.7
***************
*** 48,61 ****
  int icom_get_mode(RIG *rig, rmode_t *mode);
  int icom_set_vfo(RIG *rig, vfo_t vfo);
! int icom_set_rpt_shift(RIG *rig, rptr_shift_t rptr_shift);
! int icom_get_rpt_shift(RIG *rig, rptr_shift_t *rptr_shift);
  int icom_set_ts(RIG *rig, unsigned long ts);
  int icom_get_ts(RIG *rig, unsigned long *ts);
  int icom_set_ptt(RIG *rig, ptt_t ptt);
  int icom_get_ptt(RIG *rig, ptt_t *ptt);
! int icom_set_level(RIG *rig, setting_t set, value_t val);
! int icom_get_level(RIG *rig, setting_t set, value_t *val);
  int icom_set_channel(RIG *rig, const channel_t *chan);
  int icom_get_channel(RIG *rig, channel_t *chan);
  int icom_decode_event(RIG *rig);
  
--- 48,66 ----
  int icom_get_mode(RIG *rig, rmode_t *mode);
  int icom_set_vfo(RIG *rig, vfo_t vfo);
! int icom_set_rptr_shift(RIG *rig, rptr_shift_t rptr_shift);
! int icom_get_rptr_shift(RIG *rig, rptr_shift_t *rptr_shift);
  int icom_set_ts(RIG *rig, unsigned long ts);
  int icom_get_ts(RIG *rig, unsigned long *ts);
  int icom_set_ptt(RIG *rig, ptt_t ptt);
  int icom_get_ptt(RIG *rig, ptt_t *ptt);
! int icom_set_bank(RIG *rig, int bank);
! int icom_set_mem(RIG *rig, int ch);
! int icom_mv_ctl(RIG *rig, mv_op_t op);
! int icom_set_level(RIG *rig, setting_t level, value_t val);
! int icom_get_level(RIG *rig, setting_t level, value_t *val);
  int icom_set_channel(RIG *rig, const channel_t *chan);
  int icom_get_channel(RIG *rig, channel_t *chan);
+ int icom_set_poweron(RIG *rig);
+ int icom_set_poweroff(RIG *rig);
  int icom_decode_event(RIG *rig);
  

Index: icom.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/icom/icom.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** icom.c	2000/10/16 22:34:22	1.7
--- icom.c	2000/10/23 19:48:12	1.8
***************
*** 141,145 ****
   * TODO: sort this list with most frequent rigs first.
   */
- #define UNKNOWN_ADDR 0x01
  static const struct icom_addr icom_addr_list[] = {
  		{ RIG_MODEL_IC706, 0x48 },
--- 141,144 ----
***************
*** 157,161 ****
  		{ RIG_MODEL_IC728, 0x38 },
  		{ RIG_MODEL_IC729, 0x3a },
! 		{ RIG_MODEL_IC731, 0x04 },
  		{ RIG_MODEL_IC735, 0x04 },
  		{ RIG_MODEL_IC736, 0x40 },
--- 156,160 ----
  		{ RIG_MODEL_IC728, 0x38 },
  		{ RIG_MODEL_IC729, 0x3a },
! 		{ RIG_MODEL_IC731, 0x02 },	/* need confirmation */
  		{ RIG_MODEL_IC735, 0x04 },
  		{ RIG_MODEL_IC736, 0x40 },
***************
*** 185,189 ****
  		{ RIG_MODEL_ICR9000, 0x2a },
  		{ RIG_MODEL_MINISCOUT, 0x94 },
! 		{ RIG_MODEL_IC718, UNKNOWN_ADDR },
  		{ -1, 0 },
  };
--- 184,188 ----
  		{ RIG_MODEL_ICR9000, 0x2a },
  		{ RIG_MODEL_MINISCOUT, 0x94 },
! 		{ RIG_MODEL_IC718, 0x36 },	/* need confirmation */
  		{ -1, 0 },
  };
***************
*** 437,441 ****
   * Assumes rig!=NULL, rig->state.priv!=NULL
   */
! int icom_set_level(RIG *rig, setting_t set, value_t val)
  {
  			return -RIG_ENIMPL;
--- 436,440 ----
   * Assumes rig!=NULL, rig->state.priv!=NULL
   */
! int icom_set_level(RIG *rig, setting_t level, value_t val)
  {
  			return -RIG_ENIMPL;
***************
*** 446,450 ****
   * Assumes rig!=NULL, rig->state.priv!=NULL, val!=NULL
   */
! int icom_get_level(RIG *rig, setting_t set, value_t *val)
  {
  		struct icom_priv_data *priv;
--- 445,449 ----
   * Assumes rig!=NULL, rig->state.priv!=NULL, val!=NULL
   */
! int icom_get_level(RIG *rig, setting_t level, value_t *val)
  {
  		struct icom_priv_data *priv;
***************
*** 459,463 ****
  
  
! 		switch (set) {
  		case RIG_LEVEL_PREAMP:
  			lvl_cn = C_CTL_FUNC;
--- 458,462 ----
  
  
! 		switch (level) {
  		case RIG_LEVEL_PREAMP:
  			lvl_cn = C_CTL_FUNC;
***************
*** 554,558 ****
  			break;
  		default:
! 			rig_debug(RIG_DEBUG_ERR,"Unsupported get level %d", set);
  			return -RIG_EINVAL;
  		}
--- 553,557 ----
  			break;
  		default:
! 			rig_debug(RIG_DEBUG_ERR,"Unsupported get level %d", level);
  			return -RIG_EINVAL;
  		}
***************
*** 585,589 ****
  #endif
  		/* translate to db */
! 		if (set == RIG_LEVEL_STRENGTH)
  			val->i = rint(STR_MAX/(STR_CEILING-STR_FLOOR)*max(icom_val-STR_FLOOR,0));
  		else
--- 584,588 ----
  #endif
  		/* translate to db */
! 		if (level == RIG_LEVEL_STRENGTH)
  			val->i = rint(STR_MAX/(STR_CEILING-STR_FLOOR)*max(icom_val-STR_FLOOR,0));
  		else
***************
*** 595,639 ****
  
  /*
-  * icom_set_rpt_shift
-  * Assumes rig!=NULL, rig->state.priv!=NULL
-  */
- int icom_set_rpt_shift(RIG *rig, rptr_shift_t rptr_shift)
- {
- 		struct icom_priv_data *priv;
- 		struct rig_state *rig_s;
- 		unsigned char ackbuf[16];
- 		int ack_len;
- 		int rptr_sc;
- 
- 		rig_s = &rig->state;
- 		priv = (struct icom_priv_data*)rig_s->priv;
- 
- 		switch (rptr_shift) {
- 		case RIG_RPT_SHIFT_NONE:
- 			rptr_sc = S_DUP_OFF;	/* Simplex mode */
- 			break;
- 		case RIG_RPT_SHIFT_MINUS:
- 			rptr_sc = S_DUP_M;		/* Duples - mode */
- 			break;
- 		case RIG_RPT_SHIFT_PLUS:
- 			rptr_sc = S_DUP_P;		/* Duplex + mode */
- 			break;
- 		default:
- 			rig_debug(RIG_DEBUG_ERR,"Unsupported shift %d", rptr_shift);
- 			return -RIG_EINVAL;
- 		}
- 
- 		icom_transaction (rig, C_CTL_SPLT, rptr_sc, NULL, 0, ackbuf, &ack_len);
- 
- 		if (ack_len != 1 || ackbuf[0] != ACK) {
- 				rig_debug(RIG_DEBUG_ERR,"icom_set_rptr_shift: ack NG (%#.2x),
- 								len=%d\n", ackbuf[0],ack_len);
- 				return -RIG_ERJCTED;
- 		}
- 
- 		return RIG_OK;
- }
- 
- /*
   * icom_set_ptt
   * Assumes rig!=NULL, rig->state.priv!=NULL
--- 594,597 ----
***************
*** 693,702 ****
  }
  
  
  /*
!  * icom_get_rpt_shift
   * Assumes rig!=NULL, rig->state.priv!=NULL, rptr_shift!=NULL
   */
! int icom_get_rpt_shift(RIG *rig, rptr_shift_t *rptr_shift)
  {
  		struct icom_priv_data *priv;
--- 651,701 ----
  }
  
+ /*
+  * icom_set_rptr_shift
+  * Assumes rig!=NULL, rig->state.priv!=NULL
+  */
+ int icom_set_rptr_shift(RIG *rig, rptr_shift_t rptr_shift)
+ {
+ 		struct icom_priv_data *priv;
+ 		struct rig_state *rig_s;
+ 		unsigned char ackbuf[16];
+ 		int ack_len;
+ 		int rptr_sc;
+ 
+ 		rig_s = &rig->state;
+ 		priv = (struct icom_priv_data*)rig_s->priv;
+ 
+ 		switch (rptr_shift) {
+ 		case RIG_RPT_SHIFT_NONE:
+ 			rptr_sc = S_DUP_OFF;	/* Simplex mode */
+ 			break;
+ 		case RIG_RPT_SHIFT_MINUS:
+ 			rptr_sc = S_DUP_M;		/* Duplex - mode */
+ 			break;
+ 		case RIG_RPT_SHIFT_PLUS:
+ 			rptr_sc = S_DUP_P;		/* Duplex + mode */
+ 			break;
+ 		default:
+ 			rig_debug(RIG_DEBUG_ERR,"Unsupported shift %d", rptr_shift);
+ 			return -RIG_EINVAL;
+ 		}
+ 
+ 		icom_transaction (rig, C_CTL_SPLT, rptr_sc, NULL, 0, ackbuf, &ack_len);
+ 
+ 		if (ack_len != 1 || ackbuf[0] != ACK) {
+ 				rig_debug(RIG_DEBUG_ERR,"icom_set_rptr_shift: ack NG (%#.2x),
+ 								len=%d\n", ackbuf[0],ack_len);
+ 				return -RIG_ERJCTED;
+ 		}
+ 
+ 		return RIG_OK;
+ }
+ 
  
  /*
!  * icom_get_rptr_shift
   * Assumes rig!=NULL, rig->state.priv!=NULL, rptr_shift!=NULL
   */
! int icom_get_rptr_shift(RIG *rig, rptr_shift_t *rptr_shift)
  {
  		struct icom_priv_data *priv;
***************
*** 791,795 ****
  
  		/*
! 		 * rptrbuf should contain Cn,Sc
  		 */
  		ts_len--;
--- 790,794 ----
  
  		/*
! 		 * tsbuf should contain Cn,Sc
  		 */
  		ts_len--;
***************
*** 909,912 ****
--- 908,1079 ----
  }
  
+ 
+ 
+ /*
+  * icom_set_poweron
+  * Assumes rig!=NULL, rig->state.priv!=NULL
+  */
+ int icom_set_poweron(RIG *rig)
+ {
+ 		unsigned char ackbuf[16];
+ 		int ack_len;
+ 
+ 		icom_transaction(rig, C_SET_PWR, S_PWR_ON, NULL, 0, ackbuf, &ack_len);
+ 
+ 		if (ack_len != 1 || ackbuf[0] != ACK) {
+ 				rig_debug(RIG_DEBUG_ERR,"icom_set_poweron: ack NG (%#.2x),
+ 								len=%d\n", ackbuf[0],ack_len);
+ 				return -RIG_ERJCTED;
+ 		}
+ 
+ 		return RIG_OK;
+ }
+ 
+ /*
+  * icom_set_poweroff
+  * Assumes rig!=NULL, rig->state.priv!=NULL
+  */
+ int icom_set_poweroff(RIG *rig)
+ {
+ 		unsigned char ackbuf[16];
+ 		int ack_len;
+ 
+ 		icom_transaction(rig, C_SET_PWR, S_PWR_OFF, NULL, 0, ackbuf, &ack_len);
+ 
+ 		if (ack_len != 1 || ackbuf[0] != ACK) {
+ 				rig_debug(RIG_DEBUG_ERR,"icom_set_poweroff: ack NG (%#.2x),
+ 								len=%d\n", ackbuf[0],ack_len);
+ 				return -RIG_ERJCTED;
+ 		}
+ 
+ 		return RIG_OK;
+ }
+ 
+ /*
+  * icom_set_mem
+  * Assumes rig!=NULL, rig->state.priv!=NULL
+  */
+ int icom_set_mem(RIG *rig, int ch)
+ {
+ 		struct icom_priv_data *priv;
+ 		struct rig_state *rig_s;
+ 		unsigned char membuf[2];
+ 		unsigned char ackbuf[16];
+ 		int ack_len;
+ 
+ 		rig_s = &rig->state;
+ 		priv = (struct icom_priv_data*)rig_s->priv;
+ 
+ 		to_bcd_be(membuf, ch, 2);
+ 		icom_transaction (rig, C_SET_MEM, -1, membuf, 2, ackbuf, &ack_len);
+ 
+ 		if (ack_len != 1 || ackbuf[0] != ACK) {
+ 				rig_debug(RIG_DEBUG_ERR,"icom_set_mem: ack NG (%#.2x),
+ 								len=%d\n", ackbuf[0], ack_len);
+ 				return -RIG_ERJCTED;
+ 		}
+ 
+ 		return RIG_OK;
+ }
+ 
+ /*
+  * icom_set_bank
+  * Assumes rig!=NULL, rig->state.priv!=NULL
+  */
+ int icom_set_bank(RIG *rig, int bank)
+ {
+ 		struct icom_priv_data *priv;
+ 		struct rig_state *rig_s;
+ 		unsigned char bankbuf[2];
+ 		unsigned char ackbuf[16];
+ 		int ack_len;
+ 
+ 		rig_s = &rig->state;
+ 		priv = (struct icom_priv_data*)rig_s->priv;
+ 
+ 		to_bcd_be(bankbuf, bank, 2);
+ 		icom_transaction (rig, C_SET_MEM, S_BANK, bankbuf, 2, ackbuf, &ack_len);
+ 
+ 		if (ack_len != 1 || ackbuf[0] != ACK) {
+ 				rig_debug(RIG_DEBUG_ERR,"icom_set_bank: ack NG (%#.2x),
+ 								len=%d\n", ackbuf[0], ack_len);
+ 				return -RIG_ERJCTED;
+ 		}
+ 
+ 		return RIG_OK;
+ }
+ 
+ /*
+  * icom_mv_ctl, Mem/VFO operation
+  * Assumes rig!=NULL, rig->state.priv!=NULL
+  */
+ int icom_mv_ctl(RIG *rig, mv_op_t op)
+ {
+ 		struct icom_priv_data *priv;
+ 		struct rig_state *rig_s;
+ 		unsigned char mvbuf[16];
+ 		unsigned char ackbuf[16];
+ 		int mv_len, ack_len;
+ 		int mv_cn, mv_sc;
+ 
+ 		rig_s = &rig->state;
+ 		priv = (struct icom_priv_data*)rig_s->priv;
+ 
+ 		mv_len = 0;
+ 
+ 		switch(op) {
+ 			case RIG_MVOP_VFO_MODE:
+ 				mv_cn = C_SET_VFO;
+ 				mv_sc = -1;
+ 				break;
+ 			case RIG_MVOP_MEM_MODE:
+ 				mv_cn = C_SET_MEM;
+ 				mv_sc = -1;
+ 				break;
+ 			case RIG_MVOP_VFO_CPY:
+ 				mv_cn = C_SET_VFO;
+ 				mv_sc = S_BTOA;
+ 				break;
+ 			case RIG_MVOP_VFO_XCHG:
+ 				mv_cn = C_SET_VFO;
+ 				mv_sc = S_XCHNG;
+ 				break;
+ 			case RIG_MVOP_DUAL_OFF:
+ 				mv_cn = C_SET_VFO;
+ 				mv_sc = S_DUAL_OFF;
+ 				break;
+ 			case RIG_MVOP_DUAL_ON:
+ 				mv_cn = C_SET_VFO;
+ 				mv_sc = S_DUAL_ON;
+ 				break;
+ 			case RIG_MVOP_FROM_VFO:
+ 				mv_cn = C_WR_MEM;
+ 				mv_sc = -1;
+ 				break;
+ 			case RIG_MVOP_TO_VFO:
+ 				mv_cn = C_MEM2VFO;
+ 				mv_sc = -1;
+ 				break;
+ 			case RIG_MVOP_MCL:
+ 				mv_cn = C_CLR_MEM;
+ 				mv_sc = -1;
+ 				break;
+ 			default:
+ 				rig_debug(RIG_DEBUG_ERR,"Unsupported mem/vfo op %d", op);
+ 				return -RIG_EINVAL;
+ 		}
+ 
+ 		icom_transaction (rig, mv_cn, mv_sc, mvbuf, mv_len, ackbuf, &ack_len);
+ 
+ #if 0
+ 		if (ack_len != 1 || ackbuf[0] != ACK) {
+ 				rig_debug(RIG_DEBUG_ERR,"icom_set_mem: ack NG (%#.2x),
+ 								len=%d\n", ackbuf[0], ack_len);
+ 				return -RIG_ERJCTED;
+ 		}
+ #endif
+ 
+ 		return RIG_OK;
+ }
  
  

Index: icom_defs.h
===================================================================
RCS file: /cvsroot/hamlib/hamlib/icom/icom_defs.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** icom_defs.h	2000/10/16 22:37:22	1.4
--- icom_defs.h	2000/10/23 19:48:12	1.5
***************
*** 42,45 ****
--- 42,47 ----
  #define ACKFRMLEN	6		/* reply frame length */
  
+ #define S_NONE -1
+ 
  /*
   * Cn controller commands
***************
*** 106,109 ****
--- 108,122 ----
  #define S_BTOA	0xa0		/* VFO A=B */
  #define S_XCHNG	0xb0		/* Switch VFO A and B */
+ #define S_SUBTOMAIN	0xb1		/* MAIN = SUB */
+ #define S_DUAL_OFF	0xc0		/* Dual watch off */
+ #define S_DUAL_ON	0xc1		/* Dual watch on */
+ #define S_MAIN	0xd0		/* Select MAIN band */
+ #define S_SUB	0xd1		/* Select SUB band */
+ #define S_FRONTWIN	0xe0		/* Select front window */
+ 
+ /*
+  * Set MEM (C_SET_MEM) sub commands
+  */
+ #define S_BANK	0xa0		/* Select memory bank */
  
  /*
***************
*** 190,193 ****
--- 203,212 ----
   */
  #define S_TRXID	0x00		/* Read transceiver ID code */
+ 
+ /*
+  * Set Power On/Off (C_SET_PWR) subcommands
+  */
+ #define S_PWR_OFF	0x00
+ #define S_PWR_ON	0x01
  
  /*

[Hamlib-cvs-digest] CVS: hamlib Makefile.am,1.1,1.2

[Stephane F. <f4...@us...>]

Update of /cvsroot/hamlib/hamlib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv11863

Modified Files:
	Makefile.am 
Log Message:
* added include/ and doc/ automaked subdirectories

Index: Makefile.am
===================================================================
RCS file: /cvsroot/hamlib/hamlib/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Makefile.am	2000/10/01 12:41:11	1.1
--- Makefile.am	2000/10/22 15:50:09	1.2
***************
*** 1,2 ****
  EXTRA_DIST = COPYING INSTALL PLAN README THANKS TODO WANTED
! SUBDIRS = src icom ft747 ft847 tests
--- 1,2 ----
  EXTRA_DIST = COPYING INSTALL PLAN README THANKS TODO WANTED
! SUBDIRS = include src icom ft747 ft847 tests doc

[Hamlib-cvs-digest] CVS: hamlib/doc hamlib-doc,NONE,1.1 split-man.pl,NONE,1.1 Makefile.am,NONE,1.1

[Stephane F. <f4...@us...>]

Update of /cvsroot/hamlib/hamlib/doc
In directory slayer.i.sourceforge.net:/tmp/cvs-serv11598

Added Files:
	hamlib-doc split-man.pl Makefile.am 
Log Message:
Initial release

--- NEW FILE ---
#!/usr/bin/perl

## Copyright (c) 1998 Michael Zucchi, All Rights Reserved        ##
## Copyright (C) 2000  Tim Waugh <tw...@re...>             ##
##                                                               ##
## This software falls under the GNU General Public License.     ##
## Please read the COPYING file for more information             ##

#
# This will read a 'c' file and scan for embedded comments in the
# style of gnome comments (+minor extensions - see below).
#

# Note: This only supports 'c'.

# usage:
# hamlibdoc [ -docbook | -html | -text | -man ]
#           [ -function funcname [ -function funcname ...] ] c file(s)s > outputfile
# or
#           [ -nofunction funcname [ -function funcname ...] ] c file(s)s > outputfile
#
#  Set output format using one of -docbook -html -text or -man.  Default is man.
#
#  -function funcname
#	If set, then only generate documentation for the given function(s).  All
#	other functions are ignored.
#
#  -nofunction funcname
#	If set, then only generate documentation for the other function(s).  All
#	other functions are ignored. Cannot be used with -function together
#	(yes thats a bug - perl hackers can fix it 8))
#
#  c files - list of 'c' files to process
#
#  All output goes to stdout, with errors to stderr.

#
# format of comments.
# In the following table, (...)? signifies optional structure.
#                         (...)* signifies 0 or more structure elements
# /**
#  * function_name(:)? (- short description)?
# (* @parameterx: (description of parameter x)?)*
# (* a blank line)?
#  * (Description:)? (Description of function)?
#  * (section header: (section description)? )*
#  (*)?*/
#
# So .. the trivial example would be:
#
# /**
#  * my_function
#  **/
#
# If the Description: header tag is ommitted, then there must be a blank line
# after the last parameter specification.
# e.g.
# /**
#  * my_function - does my stuff
#  * @my_arg: its mine damnit
#  *
#  * Does my stuff explained. 
#  */
#
#  or, could also use:
# /**
#  * my_function - does my stuff
#  * @my_arg: its mine damnit
#  * Description: Does my stuff explained. 
#  */
# etc.
#
# All descriptions can be multiline, apart from the short function description.
#
# All descriptive text is further processed, scanning for the following special
# patterns, which are highlighted appropriately.
#
# 'funcname()' - function
# '$ENVVAR' - environmental variable
# '&struct_name' - name of a structure (up to two words including 'struct')
# '@parameter' - name of a parameter
# '%CONST' - name of a constant.

# match expressions used to find embedded type information
$type_constant = "\\\%([-_\\w]+)";
$type_func = "(\\w+)\\(\\)";
$type_param = "\\\@(\\w+)";
$type_struct = "\\\&((struct\\s*)?\\w+)";
$type_env = "(\\\$\\w+)";


# Output conversion substitutions.
#  One for each output format

# these work fairly well
%highlights_html = ( $type_constant, "<i>\$1</i>",
		     $type_func, "<b>\$1</b>",
		     $type_struct, "<i>\$1</i>",
		     $type_param, "<tt><b>\$1</b></tt>" );
$blankline_html = "<p>";

# sgml, docbook format
%highlights_sgml = ( "([^=])\\\"([^\\\"<]+)\\\"", "\$1<quote>\$2</quote>",
		     $type_constant, "<constant>\$1</constant>",
		     $type_func, "<function>\$1</function>",
		     $type_struct, "<structname>\$1</structname>",
		     $type_env, "<envar>\$1</envar>",
		     $type_param, "<parameter>\$1</parameter>" );
$blankline_sgml = "</para><para>\n";

# gnome, docbook format
%highlights_gnome = ( $type_constant, "<replaceable class=\"option\">\$1</replaceable>",
		     $type_func, "<function>\$1</function>",
		     $type_struct, "<structname>\$1</structname>",
		     $type_env, "<envar>\$1</envar>",
		     $type_param, "<parameter>\$1</parameter>" );
$blankline_gnome = "</para><para>\n";

# these are pretty rough
%highlights_man = ( $type_constant, "\$1",
		    $type_func, "\\\\fB\$1\\\\fP",
		    $type_struct, "\\\\fI\$1\\\\fP",
		    $type_param, "\\\\fI\$1\\\\fP" );
$blankline_man = "";

# text-mode
%highlights_text = ( $type_constant, "\$1",
		     $type_func, "\$1",
		     $type_struct, "\$1",
		     $type_param, "\$1" );
$blankline_text = "";


sub usage {
    print "Usage: $0 [ -v ] [ -docbook | -html | -text | -man ]\n";
    print "         [ -function funcname [ -function funcname ...] ]\n";
    print "         [ -nofunction funcname [ -nofunction funcname ...] ]\n";
    print "         c source file(s) > outputfile\n";
    exit 1;
}

# read arguments
if ($#ARGV==-1) {
    usage();
}

$verbose = 0;
$output_mode = "man";
%highlights = %highlights_man;
$blankline = $blankline_man;
$modulename = "Hamlib API Documentation";
$function_only = 0;
while ($ARGV[0] =~ m/^-(.*)/) {
    $cmd = shift @ARGV;
    if ($cmd eq "-html") {
	$output_mode = "html";
	%highlights = %highlights_html;
	$blankline = $blankline_html;
    } elsif ($cmd eq "-man") {
	$output_mode = "man";
	%highlights = %highlights_man;
	$blankline = $blankline_man;
    } elsif ($cmd eq "-text") {
	$output_mode = "text";
	%highlights = %highlights_text;
	$blankline = $blankline_text;
    } elsif ($cmd eq "-docbook") {
	$output_mode = "sgml";
	%highlights = %highlights_sgml;
	$blankline = $blankline_sgml;
    } elsif ($cmd eq "-gnome") {
	$output_mode = "gnome";
	%highlights = %highlights_gnome;
	$blankline = $blankline_gnome;
    } elsif ($cmd eq "-module") { # not needed for sgml, inherits from calling document
	$modulename = shift @ARGV;
    } elsif ($cmd eq "-function") { # to only output specific functions
	$function_only = 1;
	$function = shift @ARGV;
	$function_table{$function} = 1;
    } elsif ($cmd eq "-nofunction") { # to only output specific functions
	$function_only = 2;
	$function = shift @ARGV;
	$function_table{$function} = 1;
    } elsif ($cmd eq "-v") {
	$verbose = 1;
    } elsif (($cmd eq "-h") || ($cmd eq "--help")) {
	usage();
    }
}


# generate a sequence of code that will splice in highlighting information
# using the s// operator.
$dohighlight = "";
foreach $pattern (keys %highlights) {
#    print "scanning pattern $pattern ($highlights{$pattern})\n";
    $dohighlight .=  "\$contents =~ s:$pattern:$highlights{$pattern}:gs;\n";
}

##
# dumps section contents to arrays/hashes intended for that purpose.
#
sub dump_section {
    my $name = shift @_;
    my $contents = join "\n", @_;

    if ($name =~ m/$type_constant/) {
	$name = $1;
#	print STDERR "constant section '$1' = '$contents'\n";
	$constants{$name} = $contents;
    } elsif ($name =~ m/$type_param/) {
#	print STDERR "parameter def '$1' = '$contents'\n";
	$name = $1;
	$parameters{$name} = $contents;
    } else {
#	print STDERR "other section '$name' = '$contents'\n";
	$sections{$name} = $contents;
	push @sectionlist, $name;
    }
}

##
# output function
#
# parameters, a hash.
#  function => "function name"
#  parameterlist => @list of parameters
#  parameters => %parameter descriptions
#  sectionlist => @list of sections
#  sections => %descriont descriptions
#  

sub output_highlight {
    my $contents = join "\n", @_;
    my $line;

    eval $dohighlight;
    foreach $line (split "\n", $contents) {
	if ($line eq ""){
	    print $lineprefix, $blankline;
	} else {
            $line =~ s/\\\\\\/\&/g;
	    print $lineprefix, $line;
	}
	print "\n";
    }
}


# output in html
sub output_html {
    my %args = %{$_[0]};
    my ($parameter, $section);
    my $count;
    print "<h2>Function</h2>\n";

    print "<i>".$args{'functiontype'}."</i>\n";
    print "<b>".$args{'function'}."</b>\n";
    print "(";
    $count = 0;
    foreach $parameter (@{$args{'parameterlist'}}) {
	$type = $args{'parametertypes'}{$parameter};
	if ($type =~ m/([^\(]*\(\*)\s*\)\s*\(([^\)]*)\)/) {
	    # pointer-to-function
	    print "<i>$1</i><b>$parameter</b>) <i>($2)</i>";
	} else {
	    print "<i>".$type."</i> <b>".$parameter."</b>";
	}
	if ($count != $#{$args{'parameterlist'}}) {
	    $count++;
	    print ",\n";
	}
    }
    print ")\n";

    print "<h3>Arguments</h3>\n";
    print "<dl>\n";
    foreach $parameter (@{$args{'parameterlist'}}) {
	print "<dt><b>".$parameter."</b>\n";
	print "<dd>";
	output_highlight($args{'parameters'}{$parameter});
    }
    print "</dl>\n";
    foreach $section (@{$args{'sectionlist'}}) {
	print "<h3>$section</h3>\n";
	print "<blockquote>\n";
	output_highlight($args{'sections'}{$section});
	print "</blockquote>\n";
    }
    print "<hr>\n";
}


# output in html
sub output_intro_html {
    my %args = %{$_[0]};
    my ($parameter, $section);
    my $count;

    foreach $section (@{$args{'sectionlist'}}) {
	print "<h3>$section</h3>\n";
	print "<ul>\n";
	output_highlight($args{'sections'}{$section});
	print "</ul>\n";
    }
    print "<hr>\n";
}



# output in sgml DocBook
sub output_sgml {
    my %args = %{$_[0]};
    my ($parameter, $section);
    my $count;
    my $id;

    $id = "API-".$args{'function'};
    $id =~ s/[^A-Za-z0-9]/-/g;

    print "<refentry>\n";
    print "<refmeta>\n";
    print "<refentrytitle><phrase id=\"$id\">".$args{'function'}."</phrase></refentrytitle>\n";
    print "</refmeta>\n";
    print "<refnamediv>\n";
    print " <refname>".$args{'function'}."</refname>\n";
    print " <refpurpose>\n";
    print "  ".$args{'purpose'}."\n";
    print " </refpurpose>\n";
    print "</refnamediv>\n";

    print "<refsynopsisdiv>\n";
    print " <title>Synopsis</title>\n";
    print "  <funcsynopsis>\n";
    print "   <funcdef>".$args{'functiontype'}." ";
    print "<function>".$args{'function'}." ";
    print "</function></funcdef>\n";

#    print "<refsect1>\n";
#    print " <title>Synopsis</title>\n";
#    print "  <funcsynopsis>\n";
#    print "   <funcdef>".$args{'functiontype'}." ";
#    print "<function>".$args{'function'}." ";
#    print "</function></funcdef>\n";

    $count = 0;
    if ($#{$args{'parameterlist'}} >= 0) {
	foreach $parameter (@{$args{'parameterlist'}}) {
	    $type = $args{'parametertypes'}{$parameter};
	    if ($type =~ m/([^\(]*\(\*)\s*\)\s*\(([^\)]*)\)/) {
		# pointer-to-function
		print "   <paramdef>$1<parameter>$parameter</parameter>)\n";
		print "     <funcparams>$2</funcparams></paramdef>\n";
	    } else {
		print "   <paramdef>".$type;
		print " <parameter>$parameter</parameter></paramdef>\n";
	    }
	}
    } else {
	print "  <void>\n";
    }
    print "  </funcsynopsis>\n";
    print "</refsynopsisdiv>\n";
#    print "</refsect1>\n";

    # print parameters
    print "<refsect1>\n <title>Arguments</title>\n";
#    print "<para>\nArguments\n";
    if ($#{$args{'parameterlist'}} >= 0) {
	print " <variablelist>\n";
	foreach $parameter (@{$args{'parameterlist'}}) {
	    print "  <varlistentry>\n   <term><parameter>$parameter</parameter></term>\n";
	    print "   <listitem>\n    <para>\n";
	    $lineprefix="     ";
	    output_highlight($args{'parameters'}{$parameter});
	    print "    </para>\n   </listitem>\n  </varlistentry>\n";
	}
	print " </variablelist>\n";
    } else {
	print " <para>\n  None\n </para>\n";
    }
    print "</refsect1>\n";

    # print out each section
    $lineprefix="   ";
    foreach $section (@{$args{'sectionlist'}}) {
	print "<refsect1>\n <title>$section</title>\n <para>\n";
#	print "<para>\n$section\n";
	if ($section =~ m/EXAMPLE/i) {
	    print "<example><para>\n";
	}
	output_highlight($args{'sections'}{$section});
#	print "</para>";
	if ($section =~ m/EXAMPLE/i) {
	    print "</para></example>\n";
	}
	print " </para>\n</refsect1>\n";
    }

    print "</refentry>\n\n";
}

# output in sgml DocBook
sub output_intro_sgml {
    my %args = %{$_[0]};
    my ($parameter, $section);
    my $count;
    my $id;

    $id = $args{'module'};
    $id =~ s/[^A-Za-z0-9]/-/g;

    # print out each section
    $lineprefix="   ";
    foreach $section (@{$args{'sectionlist'}}) {
	print "<refsect1>\n <title>$section</title>\n <para>\n";
#	print "<para>\n$section\n";
	if ($section =~ m/EXAMPLE/i) {
	    print "<example><para>\n";
	}
	output_highlight($args{'sections'}{$section});
#	print "</para>";
	if ($section =~ m/EXAMPLE/i) {
	    print "</para></example>\n";
	}
	print " </para>\n</refsect1>\n";
    }

    print "\n\n";
}

# output in sgml DocBook
sub output_gnome {
    my %args = %{$_[0]};
    my ($parameter, $section);
    my $count;
    my $id;

    $id = $args{'module'}."-".$args{'function'};
    $id =~ s/[^A-Za-z0-9]/-/g;

    print "<sect2>\n";
    print " <title id=\"$id\">".$args{'function'}."</title>\n";

#    print "<simplesect>\n";
#    print " <title>Synopsis</title>\n";
    print "  <funcsynopsis>\n";
    print "   <funcdef>".$args{'functiontype'}." ";
    print "<function>".$args{'function'}." ";
    print "</function></funcdef>\n";

    $count = 0;
    if ($#{$args{'parameterlist'}} >= 0) {
	foreach $parameter (@{$args{'parameterlist'}}) {
	    $type = $args{'parametertypes'}{$parameter};
	    if ($type =~ m/([^\(]*\(\*)\s*\)\s*\(([^\)]*)\)/) {
		# pointer-to-function
		print "   <paramdef>$1 <parameter>$parameter</parameter>)\n";
		print "     <funcparams>$2</funcparams></paramdef>\n";
	    } else {
		print "   <paramdef>".$type;
		print " <parameter>$parameter</parameter></paramdef>\n";
	    }
	}
    } else {
	print "  <void>\n";
    }
    print "  </funcsynopsis>\n";
#    print "</simplesect>\n";
#    print "</refsect1>\n";

    # print parameters
#    print "<simplesect>\n <title>Arguments</title>\n";
#    if ($#{$args{'parameterlist'}} >= 0) {
#	print " <variablelist>\n";
#	foreach $parameter (@{$args{'parameterlist'}}) {
#	    print "  <varlistentry>\n   <term><parameter>$parameter</parameter></term>\n";
#	    print "   <listitem>\n    <para>\n";
#	    $lineprefix="     ";
#	    output_highlight($args{'parameters'}{$parameter});
#	    print "    </para>\n   </listitem>\n  </varlistentry>\n";
#	}
#	print " </variablelist>\n";
#    } else {
#	print " <para>\n  None\n </para>\n";
#    }
#    print "</simplesect>\n";

#    print "<simplesect>\n <title>Arguments</title>\n";
    if ($#{$args{'parameterlist'}} >= 0) {
	print " <informaltable pgwide=\"1\" frame=\"none\" role=\"params\">\n";
	print "<tgroup cols=\"2\">\n";
	print "<colspec colwidth=\"2*\">\n";
	print "<colspec colwidth=\"8*\">\n";
	print "<tbody>\n";
	foreach $parameter (@{$args{'parameterlist'}}) {
	    print "  <row><entry align=\"right\"><parameter>$parameter</parameter></entry>\n";
	    print "   <entry>\n";
	    $lineprefix="     ";
	    output_highlight($args{'parameters'}{$parameter});
	    print "    </entry></row>\n";
	}
	print " </tbody></tgroup></informaltable>\n";
    } else {
	print " <para>\n  None\n </para>\n";
    }
#    print "</simplesect>\n";

    # print out each section
    $lineprefix="   ";
    foreach $section (@{$args{'sectionlist'}}) {
	print "<simplesect>\n <title>$section</title>\n";
#	print "<para>\n$section\n";
	if ($section =~ m/EXAMPLE/i) {
	    print "<example><programlisting>\n";
	} else {
	}
	print "<para>\n";
	output_highlight($args{'sections'}{$section});
#	print "</para>";
	print "</para>\n";
	if ($section =~ m/EXAMPLE/i) {
	    print "</programlisting></example>\n";
	} else {
	}
	print " </simplesect>\n";
    }

    print "</sect2>\n\n";
}

##
# output in man
sub output_man {
    my %args = %{$_[0]};
    my ($parameter, $section);
    my $count;

    print ".TH \"$args{'module'}\" 4 \"$args{'function'}\" \"20 October 2000\" \"Hamlib API Manual\" LINUX\n";

    print ".SH NAME\n";
    print $args{'function'}." \\- ".$args{'purpose'}."\n";

    print ".SH SYNOPSIS\n";
    print ".B \"".$args{'functiontype'}."\" ".$args{'function'}."\n";
    $count = 0;
    $parenth = "(";
    $post = ",";
    foreach $parameter (@{$args{'parameterlist'}}) {
	if ($count == $#{$args{'parameterlist'}}) {
	    $post = ");";
	}
	$type = $args{'parametertypes'}{$parameter};
	if ($type =~ m/([^\(]*\(\*)\s*\)\s*\(([^\)]*)\)/) {
	    # pointer-to-function
	    print ".BI \"".$parenth.$1."\" ".$parameter." \") (".$2.")".$post."\"\n";
	} else {
	    $type =~ s/([^\*])$/\1 /;
	    print ".BI \"".$parenth.$type."\" ".$parameter." \"".$post."\"\n";
	}
	$count++;
	$parenth = "";
    }

    print ".SH Arguments\n";
    foreach $parameter (@{$args{'parameterlist'}}) {
	print ".IP \"".$parameter."\" 12\n";
	output_highlight($args{'parameters'}{$parameter});
    }
    foreach $section (@{$args{'sectionlist'}}) {
	print ".SH \"$section\"\n";
	output_highlight($args{'sections'}{$section});
    }
}

sub output_intro_man {
    my %args = %{$_[0]};
    my ($parameter, $section);
    my $count;

    print ".TH \"$args{'module'}\" 4 \"$args{'module'}\" \"20 October 2000\" \"Hamlib API Manual\" LINUX\n";

    foreach $section (@{$args{'sectionlist'}}) {
	print ".SH \"$section\"\n";
	output_highlight($args{'sections'}{$section});
    }
}

##
# output in text
sub output_text {
    my %args = %{$_[0]};
    my ($parameter, $section);

    print "Function:\n\n";
    $start=$args{'functiontype'}." ".$args{'function'}." (";
    print $start;
    $count = 0;
    foreach $parameter (@{$args{'parameterlist'}}) {
	if ($type =~ m/([^\(]*\(\*)\s*\)\s*\(([^\)]*)\)/) {
	    # pointer-to-function
	    print $1.$parameter.") (".$2;
	} else {
	    print $type." ".$parameter;
	}
	if ($count != $#{$args{'parameterlist'}}) {
	    $count++;
	    print ",\n";
	    print " " x length($start);
	} else {
	    print ");\n\n";
	}
    }

    print "Arguments:\n\n";
    foreach $parameter (@{$args{'parameterlist'}}) {
	print $parameter."\n\t".$args{'parameters'}{$parameter}."\n";
    }
    foreach $section (@{$args{'sectionlist'}}) {
	print "$section:\n\n";
	output_highlight($args{'sections'}{$section});
    }
    print "\n\n";
}

sub output_intro_text {
    my %args = %{$_[0]};
    my ($parameter, $section);

    foreach $section (@{$args{'sectionlist'}}) {
	print " $section:\n";
	print "    -> ";
	output_highlight($args{'sections'}{$section});
    }
}

##
# generic output function - calls the right one based
# on current output mode.
sub output_function {
#    output_html(@_);
    eval "output_".$output_mode."(\@_);";
}

##
# generic output function - calls the right one based
# on current output mode.
sub output_intro {
#    output_html(@_);
    eval "output_intro_".$output_mode."(\@_);";
}


##
# takes a function prototype and spits out all the details
# stored in the global arrays/hsahes.
sub dump_function {
    my $prototype = shift @_;

    $prototype =~ s/^static+ //;
    $prototype =~ s/^extern+ //;
    $prototype =~ s/^inline+ //;
    $prototype =~ s/^__inline__+ //;

    if ($prototype =~ m/^()([a-zA-Z0-9_~:]+)\s*\(([^\{]*)\)/ ||
	$prototype =~ m/^(\w+)\s+([a-zA-Z0-9_~:]+)\s*\(([^\{]*)\)/ ||
	$prototype =~ m/^(\w+\s*\*)\s*([a-zA-Z0-9_~:]+)\s*\(([^\{]*)\)/ ||
	$prototype =~ m/^(\w+\s+\w+)\s+([a-zA-Z0-9_~:]+)\s*\(([^\{]*)\)/ ||
	$prototype =~ m/^(\w+\s+\w+\s*\*)\s*([a-zA-Z0-9_~:]+)\s*\(([^\{]*)\)/)  {
	$return_type = $1;
	$function_name = $2;
	$args = $3;

	# allow for up to fours args to function pointers
	$args =~ s/(\([^\),]+),/\1#/g;
	$args =~ s/(\([^\),]+),/\1#/g;
	$args =~ s/(\([^\),]+),/\1#/g;
#	print STDERR "ARGS = '$args'\n";

	foreach $arg (split ',', $args) {
	    # strip leading/trailing spaces
	    $arg =~ s/^\s*//;
	    $arg =~ s/\s*$//;

	    if ($arg =~ m/\(/) {
		# pointer-to-function
		$arg =~ tr/#/,/;
		$arg =~ m/[^\(]+\(\*([^\)]+)\)/;
		$param = $1;
		$type = $arg;
		$type =~ s/([^\(]+\(\*)$param/\1/;
	    } else {
		# evil magic to get fixed array parameters to work
		$arg =~ s/(.+\s+)(.+)\[.*/\1* \2/;
#		print STDERR "SCAN ARG: '$arg'\n";
		@args = split('\s', $arg);

#		print STDERR " -> @args\n";
		$param = pop @args;
#		print STDERR " -> @args\n";
		if ($param =~ m/^(\*+)(.*)/) {
		    $param = $2;
		    push @args, $1;
		}
		$type = join " ", @args;
	    }

	    if ($type eq "" && $param eq "...")
	    {
		$type="...";
		$param="...";
		$parameters{"..."} = "variable arguments";
	    }
	    if ($type eq "")
	    {
		$type="";
		$param="void";
		$parameters{void} = "no arguments";
	    }
            if ($parameters{$param} eq "") {
	        $parameters{$param} = "-- undescribed --";
	        print STDERR "Warning($file:$lineno): Function parameter '$param' not described in '$function_name'\n";
	    }

	    push @parameterlist, $param;
	    $parametertypes{$param} = $type;
#	    print STDERR "param = '$param', type = '$type'\n";
	}
    } else {
	print STDERR "Error($lineno): cannot understand prototype: '$prototype'\n";
	return;
    }

    if ($function_only==0 || 
     ( $function_only == 1 && defined($function_table{$function_name})) || 
     ( $function_only == 2 && !defined($function_table{$function_name})))
    {
	output_function({'function' => $function_name,
			 'module' => $modulename,
			 'functiontype' => $return_type,
			 'parameterlist' => \@parameterlist,
			 'parameters' => \%parameters,
			 'parametertypes' => \%parametertypes,
			 'sectionlist' => \@sectionlist,
			 'sections' => \%sections,
			 'purpose' => $function_purpose
			 });
    }
}

######################################################################
# main
# states
# 0 - normal code
# 1 - looking for function name
# 2 - scanning field start.
# 3 - scanning prototype.
$state = 0;
$section = "";

$doc_special = "\@\%\$\&";

$doc_start = "^/\\*\\*\$";
$doc_end = "\\*/";
$doc_com = "\\s*\\*\\s*";
$doc_func = $doc_com."(\\w+):?";
$doc_sect = $doc_com."([".$doc_special."]?[\\w ]+):(.*)";
$doc_content = $doc_com."(.*)";
$doc_block = $doc_com."DOC:\\s*(.*)?";

%constants = ();
%parameters = ();
@parameterlist = ();
%sections = ();
@sectionlist = ();

$contents = "";
$section_default = "Description";	# default section
$section_intro = "Introduction";
$section = $section_default;

$lineno = 0;
foreach $file (@ARGV) {
    chomp($file);
    if (!open(IN,"<$file")) {
	print STDERR "Error: Cannot open file $file\n";
	next;
    }
    while (<IN>) {
	$lineno++;

	if ($state == 0) {
	    if (/$doc_start/o) {
		$state = 1;		# next line is always the function name
	    }
	} elsif ($state == 1) {	# this line is the function name (always)
	    if (/$doc_block/o) {
		$state = 4;
		$contents = "";
		if ( $1 eq "" ) {
			$section = $section_intro;
		} else {
			$section = $1;
		}
            }
	    elsif (/$doc_func/o) {
		$function = $1;
		$state = 2;
		if (/-(.*)/) {
		    $function_purpose = $1;
		} else {
		    $function_purpose = "";
		}
		if ($verbose) {
		    print STDERR "Info($lineno): Scanning doc for $function\n";
		}
	    } else {
		print STDERR "WARN($lineno): Cannot understand $_ on line $lineno",
		" - I thought it was a doc line\n";
		$state = 0;
	    }
	} elsif ($state == 2) {	# look for head: lines, and include content
	    if (/$doc_sect/o) {
		$newsection = $1;
		$newcontents = $2;

		if ($contents ne "") {
		    $contents =~ s/\&/\\\\\\amp;/g;
		    $contents =~ s/\</\\\\\\lt;/g;
		    $contents =~ s/\>/\\\\\\gt;/g;
		    dump_section($section, $contents);
		    $section = $section_default;
		}

		$contents = $newcontents;
		if ($contents ne "") {
		    $contents .= "\n";
		}
		$section = $newsection;
	    } elsif (/$doc_end/) {

		if ($contents ne "") {
		    $contents =~ s/\&/\\\\\\amp;/g;
		    $contents =~ s/\</\\\\\\lt;/g;
		    $contents =~ s/\>/\\\\\\gt;/g;
		    dump_section($section, $contents);
		    $section = $section_default;
		    $contents = "";
		}

#	    print STDERR "end of doc comment, looking for prototype\n";
		$prototype = "";
		$state = 3;
	    } elsif (/$doc_content/) {
		# miguel-style comment kludge, look for blank lines after
		# @parameter line to signify start of description
		if ($1 eq "" && $section =~ m/^@/) {
		    $contents =~ s/\&/\\\\\\amp;/g;
		    $contents =~ s/\</\\\\\\lt;/g;
		    $contents =~ s/\>/\\\\\\gt;/g;
		    dump_section($section, $contents);
		    $section = $section_default;
		    $contents = "";
		} else {
		    $contents .= $1."\n";
		}
	    } else {
		# i dont know - bad line?  ignore.
		print STDERR "WARNING($lineno): bad line: $_"; 
	    }
	} elsif ($state == 3) {	# scanning for function { (end of prototype)
	    if (m#\s*/\*\s+MACDOC\s*#io) {
	      # do nothing
	    }
	    elsif (/([^\{]*)/) {
		$prototype .= $1;
	    }
	    if (/\{/) {
		$prototype =~ s@/\*.*?\*/@@gos;	# strip comments.
		$prototype =~ s@[\r\n]+@ @gos; # strip newlines/cr's.
		$prototype =~ s@^ +@@gos; # strip leading spaces
		dump_function($prototype);

		$function = "";
		%constants = ();
		%parameters = ();
		%parametertypes = ();
		@parameterlist = ();
		%sections = ();
		@sectionlist = ();
		$prototype = "";

		$state = 0;
	    }
	} elsif ($state == 4) {
		# Documentation block
	        if (/$doc_block/) {
			dump_section($section, $contents);
			output_intro({'sectionlist' => \@sectionlist,
				      'sections' => \%sections });
			$contents = "";
			$function = "";
			%constants = ();
			%parameters = ();
			%parametertypes = ();
			@parameterlist = ();
			%sections = ();
			@sectionlist = ();
			$prototype = "";
			if ( $1 eq "" ) {
				$section = $section_intro;
			} else {
				$section = $1;
			}
                }
		elsif (/$doc_end/)
		{
			dump_section($section, $contents);
			output_intro({'sectionlist' => \@sectionlist,
				      'sections' => \%sections });
			$contents = "";
			$function = "";
			%constants = ();
			%parameters = ();
			%parametertypes = ();
			@parameterlist = ();
			%sections = ();
			@sectionlist = ();
			$prototype = "";
			$state = 0;
		}
		elsif (/$doc_content/)
		{
			if ( $1 eq "" )
			{
				$contents .= $blankline;
			}
			else
			{
				$contents .= $1 . "\n";
			}	
        	}
          }
    }
}


--- NEW FILE ---
#!/usr/bin/perl

if ($#ARGV < 0) {
   die "where do I put the results?\n";
}

# mkdir $ARGV[0],0777 or die "Can't create $ARGV[0]: $!\n";
$state = 0;
while (<STDIN>) {
    if (/^\.TH \"[^\"]*\" 4 \"([^\"]*)\"/) {
        if ($state == 1) { close OUT }
        $state = 1;
        $fn = "$ARGV[0]/$1.4";
        print STDERR "Creating $fn\n";
        open OUT, ">$fn" or die "can't open $fn: $!\n";
        print OUT $_;
    } elsif ($state != 0) {
        print OUT $_;
    }
}

close OUT;

--- NEW FILE ---
bin_SCRIPTS = hamlib-doc split-man.pl

[Hamlib-cvs-digest] CVS: hamlib/include/hamlib rig.h,1.4,1.5

[Stephane F. <f4...@us...>]

Update of /cvsroot/hamlib/hamlib/include/hamlib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv12181/include/hamlib

Modified Files:
	rig.h 
Log Message:
* renamed rig_*_rpt_* functions to rig_*_rptr_* to be more uniform
* made use of setting_t type in *_has_* functions
* removed set_volume, get_volume, set_squelch, get_squelch, 
  get_squelch_status, set_ant, get_ant, int et_att, get_att,
  set_preamp, get_preamp, set_power, and get_power 
  in favor of set_level/get_level.
* set_func takes one more arg for the status (activate or desactivate)


Index: rig.h
===================================================================
RCS file: /cvsroot/hamlib/hamlib/include/hamlib/rig.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** rig.h	2000/10/16 21:58:03	1.4
--- rig.h	2000/10/22 16:02:21	1.5
***************
*** 325,329 ****
    freq_t start;
    freq_t end;
!   unsigned long modes;	/* bitwise OR'ed RIG_MODE_* */
    int low_power;	/* in mW, -1 for no power (ie. rx list) */
    int high_power;	/* in mW, -1 for no power (ie. rx list) */
--- 325,329 ----
    freq_t start;
    freq_t end;
!   rmode_t modes;	/* bitwise OR'ed RIG_MODE_* */
    int low_power;	/* in mW, -1 for no power (ie. rx list) */
    int high_power;	/* in mW, -1 for no power (ie. rx list) */
***************
*** 396,402 ****
    int timeout;	/* in ms */
    int retry;		/* maximum number of retries, 0 to disable */
!   unsigned long has_func;		/* bitwise OR'ed RIG_FUNC_FAGC, NG, etc. */
!   unsigned long has_level;		/* bitwise OR'ed RIG_LEVEL_* */
!   unsigned long has_set_level;		/* bitwise OR'ed RIG_LEVEL_* */
    int chan_qty;		/* number of channels */
  #if 0
--- 396,402 ----
    int timeout;	/* in ms */
    int retry;		/* maximum number of retries, 0 to disable */
!   setting_t has_func;		/* bitwise OR'ed RIG_FUNC_FAGC, NG, etc. */
!   setting_t has_level;		/* bitwise OR'ed RIG_LEVEL_* */
!   setting_t has_set_level;		/* bitwise OR'ed RIG_LEVEL_* */
    int chan_qty;		/* number of channels */
  #if 0
***************
*** 439,447 ****
    int (*get_passband)(RIG *rig, pbwidth_t *width); /* get width */
  
!   int (*set_rpt_shift)(RIG *rig, rptr_shift_t rptr_shift);	/* set repeater shift */
!   int (*get_rpt_shift)(RIG *rig, rptr_shift_t *rptr_shift);	/* get repeater shift */
  
!   int (*set_rpt_offs)(RIG *rig, unsigned long offs);/* set duplex offset freq */
!   int (*get_rpt_offs)(RIG *rig, unsigned long *offs);/* get duplex offset freq*/
  
    int (*set_split_freq)(RIG *rig, freq_t rx_freq, freq_t tx_freq);
--- 439,447 ----
    int (*get_passband)(RIG *rig, pbwidth_t *width); /* get width */
  
!   int (*set_rptr_shift)(RIG *rig, rptr_shift_t rptr_shift);	/* set repeater shift */
!   int (*get_rptr_shift)(RIG *rig, rptr_shift_t *rptr_shift);	/* get repeater shift */
  
!   int (*set_rptr_offs)(RIG *rig, unsigned long offs);/*set duplex offset freq*/
!   int (*get_rptr_offs)(RIG *rig, unsigned long *offs);/*get duplex offset freq*/
  
    int (*set_split_freq)(RIG *rig, freq_t rx_freq, freq_t tx_freq);
***************
*** 464,504 ****
     * on all bands/modes. Have to work this out.. --SF
     */
- #if 0
-   int (*set_power)(RIG *rig, float power);	/* set TX power [0.0 .. 1.0] */
-   int (*get_power)(RIG *rig, float *power);
- #endif
- 
    int (*power2mW)(RIG *rig, unsigned int *mwpower, float power, freq_t freq, rmode_t mode);
    int (*mW2power)(RIG *rig, float *power, unsigned int mwpower, freq_t freq, rmode_t mode);
  
- #if 0
-   int (*set_volume)(RIG *rig, float vol);	/* select vol from 0.0 and 1.0 */
-   int (*get_volume)(RIG *rig, float *vol);	/* get volume */
- 
-   int (*set_squelch)(RIG *rig, float sql);	/* set squelch */
-   int (*get_squelch)(RIG *rig, float *sql);	/* get squelch setting */
-   int (*get_squelch_status)(RIG *rig, int *sql_status);	/* get squelch status */
-   int (*get_strength)(RIG *rig, int *strength);	/* get signal strength */
- #endif
- 
    int (*set_poweron)(RIG *rig);
    int (*set_poweroff)(RIG *rig);
- 
- #if 0
-   int (*set_ant)(RIG *rig, int ant);	/* set antenna number */
-   int (*get_ant)(RIG *rig, int *ant);	/* get antenna number */
- 
-   int (*set_att)(RIG *rig, int att);	/* set attenuator */
-   int (*get_att)(RIG *rig, int *att);	/* get attenuator */
- 
-   int (*set_preamp)(RIG *rig, int preamp);	/* set preamp */
-   int (*get_preamp)(RIG *rig, int *preamp);	/* get preamp */
- #endif
  
!   int (*set_level)(RIG *rig, setting_t set, value_t val);/* set level setting */
!   int (*get_level)(RIG *rig, setting_t set, value_t *val);/* set level setting*/
  
!   int (*set_func)(RIG *rig, unsigned long func); /* activate the function(s) */
!   int (*get_func)(RIG *rig, unsigned long *func); /* get the setting from rig */
  
    int (*set_mem)(RIG *rig, int ch);			/* set memory channel number */
--- 464,478 ----
     * on all bands/modes. Have to work this out.. --SF
     */
    int (*power2mW)(RIG *rig, unsigned int *mwpower, float power, freq_t freq, rmode_t mode);
    int (*mW2power)(RIG *rig, float *power, unsigned int mwpower, freq_t freq, rmode_t mode);
  
    int (*set_poweron)(RIG *rig);
    int (*set_poweroff)(RIG *rig);
  
!   int (*set_level)(RIG *rig, setting_t level, value_t val);/* set level setting */
!   int (*get_level)(RIG *rig, setting_t level, value_t *val);/* set level setting*/
  
!   int (*set_func)(RIG *rig, setting_t func, int status); /* activate the function(s) */
!   int (*get_func)(RIG *rig, setting_t *func); /* get the setting from rig */
  
    int (*set_mem)(RIG *rig, int ch);			/* set memory channel number */
***************
*** 616,623 ****
  extern int rig_get_ptt(RIG *rig, ptt_t *ptt); /* get ptt status */
  
! extern int rig_set_rpt_shift(RIG *rig, rptr_shift_t rptr_shift); /* set repeater shift */
! extern int rig_get_rpt_shift(RIG *rig, rptr_shift_t *rptr_shift); /* get repeater shift */
! extern int rig_set_rpt_offs(RIG *rig, unsigned long rptr_offs); /* set repeater offset */
! extern int rig_get_rpt_offs(RIG *rig, unsigned long *rptr_offs); /* get repeater offset */
  
  extern int rig_set_ctcss(RIG *rig, unsigned int tone);
--- 590,597 ----
  extern int rig_get_ptt(RIG *rig, ptt_t *ptt); /* get ptt status */
  
! extern int rig_set_rptr_shift(RIG *rig, rptr_shift_t rptr_shift); /* set repeater shift */
! extern int rig_get_rptr_shift(RIG *rig, rptr_shift_t *rptr_shift); /* get repeater shift */
! extern int rig_set_rptr_offs(RIG *rig, unsigned long rptr_offs); /* set repeater offset */
! extern int rig_get_rptr_offs(RIG *rig, unsigned long *rptr_offs); /* get repeater offset */
  
  extern int rig_set_ctcss(RIG *rig, unsigned int tone);
***************
*** 670,678 ****
  extern RIG *rig_probe(const char *rig_path);
  
! extern int rig_has_level(RIG *rig, setting_t level);
! extern int rig_has_set_level(RIG *rig, setting_t level);
  
! extern int rig_has_func(RIG *rig, setting_t func);	/* is part of capabilities? */
! extern int rig_set_func(RIG *rig, setting_t func);	/* activate the function(s) */
  extern int rig_get_func(RIG *rig, setting_t *func); /* get the setting from rig */
  
--- 644,652 ----
  extern RIG *rig_probe(const char *rig_path);
  
! extern setting_t rig_has_level(RIG *rig, setting_t level);
! extern setting_t rig_has_set_level(RIG *rig, setting_t level);
  
! extern setting_t rig_has_func(RIG *rig, setting_t func);	/* is part of capabilities? */
! extern int rig_set_func(RIG *rig, setting_t func, int status);	/* activate the function(s) */
  extern int rig_get_func(RIG *rig, setting_t *func); /* get the setting from rig */
  
***************
*** 688,692 ****
  
  extern const struct rig_caps *rig_get_caps(rig_model_t rig_model);
! const freq_range_t *rig_get_range(const freq_range_t range_list[], freq_t freq, unsigned long mode);
  
  extern const char *rigerror(int errnum);
--- 662,666 ----
  
  extern const struct rig_caps *rig_get_caps(rig_model_t rig_model);
! const freq_range_t *rig_get_range(const freq_range_t range_list[], freq_t freq, rmode_t mode);
  
  extern const char *rigerror(int errnum);

[Hamlib-cvs-digest] CVS: hamlib/ft847 Makefile.am,1.1,1.2

[Stephane F. <f4...@us...>]

Update of /cvsroot/hamlib/hamlib/ft847
In directory slayer.i.sourceforge.net:/tmp/cvs-serv12008/ft847

Modified Files:
	Makefile.am 
Log Message:
* added -avoid-version to LDFLAGS for dlopen modules


Index: Makefile.am
===================================================================
RCS file: /cvsroot/hamlib/hamlib/ft847/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Makefile.am	2000/10/01 12:48:05	1.1
--- Makefile.am	2000/10/22 15:55:00	1.2
***************
*** 1,4 ****
--- 1,5 ----
  lib_LTLIBRARIES = libhamlib-ft847.la
  libhamlib_ft847_la_SOURCES = ft847.c
+ libhamlib_ft847_la_LDFLAGS = -avoid-version # -module
  lib_LIBRARIES = libhamlib-ft847.a
  libhamlib_ft847_a_SOURCES = ft847.c

[Hamlib-cvs-digest] CVS: hamlib configure.in,1.2,1.3

[Stephane F. <f4...@us...>]

Update of /cvsroot/hamlib/hamlib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv11915

Modified Files:
	configure.in 
Log Message:
* added DLTOOL check
* added automaked include/ and doc/ subdirectories


Index: configure.in
===================================================================
RCS file: /cvsroot/hamlib/hamlib/configure.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** configure.in	2000/10/08 21:24:52	1.2
--- configure.in	2000/10/22 15:53:12	1.3
***************
*** 54,57 ****
--- 54,58 ----
  
  dnl initialize libtool
+ AC_LIBTOOL_DLOPEN
  AM_PROG_LIBTOOL
  
***************
*** 88,90 ****
  
  AC_OUTPUT( ft747/Makefile ft847/Makefile icom/Makefile Makefile \
! 			src/Makefile tests/Makefile )
--- 89,92 ----
  
  AC_OUTPUT( ft747/Makefile ft847/Makefile icom/Makefile Makefile \
! 			include/Makefile include/hamlib/Makefile src/Makefile \
! 			tests/Makefile doc/Makefile )

[Hamlib-cvs-digest] CVS: hamlib/ft747 Makefile.am,1.1,1.2

[Stephane F. <f4...@us...>]

Update of /cvsroot/hamlib/hamlib/ft747
In directory slayer.i.sourceforge.net:/tmp/cvs-serv12008/ft747

Modified Files:
	Makefile.am 
Log Message:
* added -avoid-version to LDFLAGS for dlopen modules


Index: Makefile.am
===================================================================
RCS file: /cvsroot/hamlib/hamlib/ft747/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Makefile.am	2000/10/01 12:47:21	1.1
--- Makefile.am	2000/10/22 15:55:00	1.2
***************
*** 1,4 ****
--- 1,5 ----
  lib_LTLIBRARIES = libhamlib-ft747.la
  libhamlib_ft747_la_SOURCES = ft747.c
+ libhamlib_ft747_la_LDFLAGS = -avoid-version # -module
  lib_LIBRARIES = libhamlib-ft747.a
  libhamlib_ft747_a_SOURCES = ft747.c

[Hamlib-cvs-digest] CVS: hamlib/icom Makefile.am,1.2,1.3

[Stephane F. <f4...@us...>]

Update of /cvsroot/hamlib/hamlib/icom
In directory slayer.i.sourceforge.net:/tmp/cvs-serv12008/icom

Modified Files:
	Makefile.am 
Log Message:
* added -avoid-version to LDFLAGS for dlopen modules


Index: Makefile.am
===================================================================
RCS file: /cvsroot/hamlib/hamlib/icom/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Makefile.am	2000/10/16 22:28:45	1.2
--- Makefile.am	2000/10/22 15:55:00	1.3
***************
*** 1,4 ****
--- 1,5 ----
  lib_LTLIBRARIES = libhamlib-icom.la
  libhamlib_icom_la_SOURCES = ic706.c icom.c frame.c
+ libhamlib_icom_la_LDFLAGS = -avoid-version # -module
  lib_LIBRARIES = libhamlib-icom.a
  libhamlib_icom_a_SOURCES = ic706.c icom.c frame.c

[Hamlib-cvs-digest] CVS: hamlib/doc/man - New directory

[Stephane F. <f4...@us...>]

Update of /cvsroot/hamlib/hamlib/doc/man
In directory slayer.i.sourceforge.net:/tmp/cvs-serv11566/man

Log Message:
Directory /cvsroot/hamlib/hamlib/doc/man added to the repository

[Hamlib-cvs-digest] CVS: hamlib/doc/html - New directory

[Stephane F. <f4...@us...>]

Update of /cvsroot/hamlib/hamlib/doc/html
In directory slayer.i.sourceforge.net:/tmp/cvs-serv11566/html

Log Message:
Directory /cvsroot/hamlib/hamlib/doc/html added to the repository

[Hamlib-cvs-digest] CVS: hamlib/doc - New directory

[Stephane F. <f4...@us...>]

Update of /cvsroot/hamlib/hamlib/doc
In directory slayer.i.sourceforge.net:/tmp/cvs-serv11519/doc

Log Message:
Directory /cvsroot/hamlib/hamlib/doc added to the repository

[Hamlib-cvs-digest] CVS: hamlib/include Makefile.am,NONE,1.1

[Stephane F. <f4...@us...>]

Update of /cvsroot/hamlib/hamlib/include
In directory slayer.i.sourceforge.net:/tmp/cvs-serv13762

Added Files:
	Makefile.am 
Log Message:
Initial release

--- NEW FILE ---
SUBDIRS = hamlib
noinst_HEADERS = config.h

[Hamlib-cvs-digest] CVS: hamlib/include/hamlib Makefile.am,NONE,1.1

[Stephane F. <f4...@us...>]

Update of /cvsroot/hamlib/hamlib/include/hamlib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv13762/hamlib

Added Files:
	Makefile.am 
Log Message:
Initial release

--- NEW FILE ---
include_HEADERS = rig.h riglist.h

[Hamlib-cvs-digest] CVS: hamlib/tests dumpcaps.c,1.4,1.5

[Stephane F. <f4...@us...>]

Update of /cvsroot/hamlib/hamlib/tests
In directory slayer.i.sourceforge.net:/tmp/cvs-serv13414/tests

Modified Files:
	dumpcaps.c 
Log Message:
* API function names changed: *_rpt_* functions to *_rptr_*


Index: dumpcaps.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/tests/dumpcaps.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** dumpcaps.c	2000/10/16 22:13:05	1.4
--- dumpcaps.c	2000/10/22 16:14:53	1.5
***************
*** 181,188 ****
  	printf("Can set ptt:\t%c\n",caps->set_ptt!=NULL?'Y':'N');
  	printf("Can get ptt:\t%c\n",caps->get_ptt!=NULL?'Y':'N');
! 	printf("Can set repeater duplex:\t%c\n",caps->set_rpt_shift!=NULL?'Y':'N');
! 	printf("Can get repeater duplex:\t%c\n",caps->get_rpt_shift!=NULL?'Y':'N');
! 	printf("Can set repeater offset:\t%c\n",caps->set_rpt_offs!=NULL?'Y':'N');
! 	printf("Can get repeater offset:\t%c\n",caps->get_rpt_offs!=NULL?'Y':'N');
  	printf("Can set tuning step:\t%c\n",caps->set_ts!=NULL?'Y':'N');
  	printf("Can get tuning step:\t%c\n",caps->get_ts!=NULL?'Y':'N');
--- 181,188 ----
  	printf("Can set ptt:\t%c\n",caps->set_ptt!=NULL?'Y':'N');
  	printf("Can get ptt:\t%c\n",caps->get_ptt!=NULL?'Y':'N');
! 	printf("Can set repeater duplex:\t%c\n",caps->set_rptr_shift!=NULL?'Y':'N');
! 	printf("Can get repeater duplex:\t%c\n",caps->get_rptr_shift!=NULL?'Y':'N');
! 	printf("Can set repeater offset:\t%c\n",caps->set_rptr_offs!=NULL?'Y':'N');
! 	printf("Can get repeater offset:\t%c\n",caps->get_rptr_offs!=NULL?'Y':'N');
  	printf("Can set tuning step:\t%c\n",caps->set_ts!=NULL?'Y':'N');
  	printf("Can get tuning step:\t%c\n",caps->get_ts!=NULL?'Y':'N');

[Hamlib-cvs-digest] CVS: hamlib/tests Makefile.am,1.2,1.3

[Stephane F. <f4...@us...>]

Update of /cvsroot/hamlib/hamlib/tests
In directory slayer.i.sourceforge.net:/tmp/cvs-serv13233/tests

Modified Files:
	Makefile.am 
Log Message:
* Added path to shared libs and modules, LD_LIBRARY_PATH is history (for now)


Index: Makefile.am
===================================================================
RCS file: /cvsroot/hamlib/hamlib/tests/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Makefile.am	2000/10/08 21:47:58	1.2
--- Makefile.am	2000/10/22 16:13:29	1.3
***************
*** 1,4 ****
  bin_PROGRAMS = dumpcaps testrig testtrn testbcd listrigs
! LDADD = -L../src/.libs -lhamlib
  testrig_SOURCES = testrig.c
  testtrn_SOURCES = testtrn.c
--- 1,6 ----
  bin_PROGRAMS = dumpcaps testrig testtrn testbcd listrigs
! LDADD = ../src/libhamlib.la
! listrigs_LDADD = ../src/libhamlib.la "-dlopen" ../icom/libhamlib-icom.la "-dlopen" ../ft747/libhamlib-ft747.la "-dlopen" ../ft847/libhamlib-ft847.la
! listrigs_DEPENDENCIES = ../icom/libhamlib-icom.la ../ft747/libhamlib-ft747.la ../ft847/libhamlib-ft847.la
  testrig_SOURCES = testrig.c
  testtrn_SOURCES = testtrn.c

[Hamlib-cvs-digest] CVS: hamlib/src Makefile.am,1.3,1.4

[Stephane F. <f4...@us...>]

Update of /cvsroot/hamlib/hamlib/src
In directory slayer.i.sourceforge.net:/tmp/cvs-serv13033/src

Modified Files:
	Makefile.am 
Log Message:
* Added -release option to LDFLAGS so the shared lib shows the current numbers


Index: Makefile.am
===================================================================
RCS file: /cvsroot/hamlib/hamlib/src/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Makefile.am	2000/10/16 21:50:33	1.3
--- Makefile.am	2000/10/22 16:09:37	1.4
***************
*** 1,4 ****
--- 1,5 ----
  lib_LTLIBRARIES = libhamlib.la
  libhamlib_la_SOURCES = rig.c  serial.c misc.c register.c event.c
+ libhamlib_la_LDFLAGS = -release @VERSION@
  lib_LIBRARIES = libhamlib.a
  libhamlib_a_SOURCES = rig.c serial.c misc.c register.c event.c