This commit was manufactured by cvs2svn to create tag 'rtems-4-6-2'.

Sprout from rtems-4-6-branch 2004-10-18 19:15:22 UTC Joel Sherrill <joel.sherrill@OARcorp.com> '2004-10-18	Joel Sherrill <joel@OARcorp.com>'
Cherrypick from rtems-4-6-branch 2004-09-30 10:28:34 UTC Ralf Corsepius <ralf.corsepius@rtems.org> '2004-09-30	Ralf Corsepius <ralf_corsepius@rtems.org>':
    scripts/ChangeLog
    scripts/autotools/autoconf-rtems.spec.in

ChangeLog

@@ -1,3 +1,50 @@
+2004-10-18	Joel Sherrill <joel@OARcorp.com>
+
+	* VERSION: Updated to rtems-4.6.2.
+
+2004-10-18	Joel Sherrill <joel@OARcorp.com>
+
+	* aclocal/version.m4: Updated to rtems-4.6.2.
+
+2004-08-18	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	PR 673/make_build
+	* config-ml.in: Quote 'cd "${ml_origdir}"'.
+	Quote 'cd "${ML_POPDIR}"'.
+
+2004-08-18	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	PR 673/make_build
+	* aclocal/ppc.m4 (RTEMS_PPC_EXCEPTIONS): Quote ac_popdir uses.
+	* aclocal/target.m4 (_RTEMS_POP_BUILDDIR): Ditto.
+	* acinclude.m4 (_RTEMS_CONFIG_SUBDIR): Quote ac_popdir uses.
+
+2004-08-18	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* acinclude.m4: Fix m4-underquoting.
+
+2004-08-18	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* aclocal/bsp-alias.m4, aclocal/bsp-arg-enable.m4,
+	aclocal/canonical-host.m4, aclocal/canonical-target-name.m4,
+	aclocal/canonicalize-tools.m4, aclocal/check-bsps.m4,
+	aclocal/check-cpu.m4, aclocal/check-custom-bsp.m4, aclocal/check-cxx.m4,
+	aclocal/check-itron.m4, aclocal/check-multiprocessing.m4,
+	aclocal/check-networking.m4, aclocal/check-newlib.m4,
+	aclocal/check-posix.m4, aclocal/check-rdbg.m4, aclocal/check-tool.m4,
+	aclocal/config-subdirs.m4, aclocal/enable-bare.m4,
+	aclocal/enable-cxx.m4, aclocal/enable-inlines.m4,
+	aclocal/enable-itron.m4, aclocal/enable-multiprocessing.m4,
+	aclocal/enable-networking.m4, aclocal/enable-posix.m4,
+	aclocal/enable-rdbg.m4, aclocal/enable-rtemsbsp.m4,
+	aclocal/enable-tests.m4, aclocal/env-rtemsbsp.m4,
+	aclocal/gcc-isystem.m4, aclocal/gcc-pipe.m4, aclocal/gcc-specs.m4,
+	aclocal/i386-gas-code16.m4, aclocal/multilib.m4, aclocal/path-ksh.m4,
+	aclocal/path-perl.m4, aclocal/prog-cc.m4, aclocal/prog-cxx.m4,
+	aclocal/project-root.m4, aclocal/rtems-debug.m4,
+	aclocal/rtems-test-no-pause.m4, aclocal/rtems-top.m4, 
+	aclocal/target.m4, aclocal/tool-paths.m4: Fix m4-underquoting.
+
 2004-04-08	Joel Sherrill <joel@OARcorp.com>
 
 	* aclocal/version.m4: Updated to rtems-4.6.1.

VERSION

@@ -4,4 +4,4 @@
 #  $Id$
 #
 
-RTEMS Version 4.6.1
+RTEMS Version 4.6.2

acinclude.m4

@@ -261,7 +261,7 @@ if test "$no_recursion" != yes; then
         AC_MSG_ERROR([$ac_sub_configure failed for $ac_dir])
     fi
 
-    cd $ac_popdir
+    cd "$ac_popdir"
   done
  fi
 fi
@@ -332,7 +332,7 @@ m4_divert_text([DEFAULTS],
 m4_expand_once([_RTEMS_COMMANDS_POST_CONFIG_SUBDIRS])
 ])
 
-AC_DEFUN(_RTEMS_BUILD_CONFIG_PREPARE,[
+AC_DEFUN([_RTEMS_BUILD_CONFIG_PREPARE],[
 ## # Record the configure arguments in Makefile.
 m4_ifdef([_RTEMS_BUILD_CONFIGDIRS_LIST],
 [
@@ -358,7 +358,7 @@ m4_divert_text([DEFAULTS],
 m4_expand_once([_RTEMS_COMMANDS_POST_CONFIG_SUBDIRS])
 ])
 
-AC_DEFUN(_RTEMS_HOST_CONFIG_PREPARE,[
+AC_DEFUN([_RTEMS_HOST_CONFIG_PREPARE],[
 m4_ifdef([_RTEMS_HOST_CONFIGDIRS_LIST],
 [
 m4_expand_once([_RTEMS_TOOLS([host],[HOST])])
@@ -382,7 +382,7 @@ m4_divert_text([DEFAULTS],
 m4_expand_once([_RTEMS_COMMANDS_POST_CONFIG_SUBDIRS])
 ])
 
-AC_DEFUN(_RTEMS_TARGET_CONFIG_PREPARE,[
+AC_DEFUN([_RTEMS_TARGET_CONFIG_PREPARE],[
 m4_ifdef([_RTEMS_TARGET_CONFIGDIRS_LIST],
 [
 m4_expand_once([_RTEMS_TOOLS([target],[TARGET])])

aclocal/bsp-alias.m4

@@ -4,7 +4,7 @@ dnl
 
 dnl _RTEMS_BSP_ALIAS(BSP_ALIAS,RTEMS_BSP_FAMILY)
 dnl Internal subroutine to RTEMS_BSP_ALIAS
-AC_DEFUN(_RTEMS_BSP_ALIAS,
+AC_DEFUN([_RTEMS_BSP_ALIAS],
 [# account for "aliased" bsps which share source code
   case $1 in
     simcpu32)     $2=sim68000         ;; # BSVC CPU32 variant
@@ -34,7 +34,7 @@ AC_DEFUN(_RTEMS_BSP_ALIAS,
 
 dnl RTEMS_BSP_ALIAS(BSP_ALIAS,RTEMS_BSP_FAMILY)
 dnl convert a bsp alias $1 into its bsp directory RTEMS_BSP_FAMILY
-AC_DEFUN(RTEMS_BSP_ALIAS,
+AC_DEFUN([RTEMS_BSP_ALIAS],
 [_RTEMS_BSP_ALIAS(m4_if([$1],,[$RTEMS_BSP],[$1]),
   m4_if([$2],,[RTEMS_BSP_FAMILY],[$2]))]
 )

aclocal/bsp-arg-enable.m4

@@ -9,7 +9,7 @@ dnl Configure scripts will receive <bsp-value> if <RTEMS_BSP> matches the
 dnl actual value of the shell variable RTEMS_BSP (cf. RTEMS_ENV_RTEMSBSP), 
 dnl and the raw value passed to --enable-FEATURE otherwise.
 dnl
-AC_DEFUN(RTEMS_BSP_ARG_ENABLE,
+AC_DEFUN([RTEMS_BSP_ARG_ENABLE],
 [AC_REQUIRE([RTEMS_ENV_RTEMSBSP])
 AC_ARG_ENABLE([$1],[$2],
 [enableval=`echo "[$enable_]patsubst([$1], -, _)" | sed -e "s%^${RTEMS_BSP}:%%"`

aclocal/canonical-host.m4

@@ -1,6 +1,6 @@
 dnl $Id$
 
-AC_DEFUN(RTEMS_CANONICAL_HOST,
+AC_DEFUN([RTEMS_CANONICAL_HOST],
 [dnl
 AC_REQUIRE([AC_CANONICAL_HOST])
 RTEMS_HOST=$host_os

aclocal/canonical-target-name.m4

@@ -8,7 +8,7 @@ dnl target naming conventions "processor-vendor-os"
 dnl Therefore autoconf's AC_CANONICAL_TARGET will fail for them
 dnl and we have to fix it for rtems ourselves 
 
-AC_DEFUN(RTEMS_CANONICAL_TARGET_CPU,
+AC_DEFUN([RTEMS_CANONICAL_TARGET_CPU],
 [
 AC_CANONICAL_TARGET
 AC_MSG_CHECKING(rtems target cpu)

aclocal/canonicalize-tools.m4

@@ -4,7 +4,7 @@ dnl
 dnl Set target tools
 dnl
 
-AC_DEFUN(RTEMS_CANONICALIZE_TOOLS,
+AC_DEFUN([RTEMS_CANONICALIZE_TOOLS],
 [AC_REQUIRE([RTEMS_PROG_CC])dnl
 
 dnl FIXME: What shall be done if these tools are not available?

aclocal/check-bsps.m4

@@ -4,7 +4,7 @@ dnl Report all available bsps for a target,
 dnl check if a bsp-subdirectory is present for all bsps found
 dnl
 dnl RTEMS_CHECK_BSPS(bsp_list)
-AC_DEFUN(RTEMS_CHECK_BSPS,
+AC_DEFUN([RTEMS_CHECK_BSPS],
 [
 AC_REQUIRE([RTEMS_CHECK_CPU])dnl sets RTEMS_CPU, target
 AC_REQUIRE([RTEMS_TOP])dnl sets RTEMS_TOPdir

aclocal/check-cpu.m4

@@ -1,7 +1,7 @@
 dnl $Id$
 
 dnl check if RTEMS support a cpu
-AC_DEFUN(RTEMS_CHECK_CPU,
+AC_DEFUN([RTEMS_CHECK_CPU],
 [dnl
 AC_REQUIRE([RTEMS_TOP])
 AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU])

aclocal/check-custom-bsp.m4

@@ -1,6 +1,6 @@
 dnl $Id$
 
-AC_DEFUN(RTEMS_CHECK_CUSTOM_BSP,[
+AC_DEFUN([RTEMS_CHECK_CUSTOM_BSP],[
 AC_REQUIRE([RTEMS_TOP])
 
 AC_MSG_CHECKING([for make/custom/[$]$1.cfg])

aclocal/check-cxx.m4

@@ -1,6 +1,6 @@
 dnl $Id$
 dnl
-AC_DEFUN(RTEMS_CHECK_CXX,
+AC_DEFUN([RTEMS_CHECK_CXX],
 [dnl
 AC_REQUIRE([RTEMS_CHECK_CPU])dnl
 AC_REQUIRE([RTEMS_PROG_CC_FOR_TARGET])dnl

aclocal/check-itron.m4

@@ -1,6 +1,6 @@
 dnl $Id$
 dnl
-AC_DEFUN(RTEMS_CHECK_ITRON_API,
+AC_DEFUN([RTEMS_CHECK_ITRON_API],
 [dnl
 AC_REQUIRE([RTEMS_CHECK_CPU])dnl
 AC_REQUIRE([RTEMS_ENABLE_ITRON])dnl
@@ -28,7 +28,7 @@ fi
 AC_SUBST(HAS_ITRON_API)dnl
 ])
 
-AC_DEFUN(RTEMS_DEFINE_ITRON_API,
+AC_DEFUN([RTEMS_DEFINE_ITRON_API],
 [AC_REQUIRE([RTEMS_CHECK_ITRON_API])dnl
 if test x"${HAS_ITRON_API}" = x"yes";
 then

aclocal/check-multiprocessing.m4

@@ -2,7 +2,7 @@ dnl
 dnl $Id$
 dnl
 
-AC_DEFUN(RTEMS_CHECK_MULTIPROCESSING,
+AC_DEFUN([RTEMS_CHECK_MULTIPROCESSING],
 [dnl
 AC_REQUIRE([RTEMS_ENABLE_MULTILIB])dnl
 AC_REQUIRE([RTEMS_ENV_RTEMSBSP])dnl

aclocal/check-networking.m4

@@ -1,6 +1,6 @@
 dnl $Id$
 dnl
-AC_DEFUN(RTEMS_CHECK_NETWORKING,
+AC_DEFUN([RTEMS_CHECK_NETWORKING],
 [dnl
 AC_REQUIRE([RTEMS_CHECK_CPU])dnl
 AC_REQUIRE([RTEMS_ENABLE_NETWORKING])dnl

aclocal/check-newlib.m4

@@ -1,6 +1,6 @@
 dnl $Id$
 
-AC_DEFUN(RTEMS_CHECK_NEWLIB,
+AC_DEFUN([RTEMS_CHECK_NEWLIB],
 [dnl
 AC_REQUIRE([RTEMS_PROG_CC_FOR_TARGET])dnl
 AC_REQUIRE([RTEMS_CANONICALIZE_TOOLS])dnl

aclocal/check-posix.m4

@@ -1,6 +1,6 @@
 dnl $Id$
 dnl
-AC_DEFUN(RTEMS_CHECK_POSIX_API,
+AC_DEFUN([RTEMS_CHECK_POSIX_API],
 [dnl
 AC_REQUIRE([RTEMS_CHECK_CPU])dnl
 AC_REQUIRE([RTEMS_ENABLE_POSIX])dnl
@@ -28,7 +28,7 @@ fi
 AC_SUBST(HAS_POSIX_API)dnl
 ])
 
-AC_DEFUN(RTEMS_DEFINE_POSIX_API,
+AC_DEFUN([RTEMS_DEFINE_POSIX_API],
 [AC_REQUIRE([RTEMS_CHECK_POSIX_API])dnl
 AS_IF(
   [test x"${HAS_POSIX_API}" = x"yes"],

aclocal/check-rdbg.m4

@@ -1,6 +1,6 @@
 dnl $Id$
 dnl
-AC_DEFUN(RTEMS_CHECK_RDBG,
+AC_DEFUN([RTEMS_CHECK_RDBG],
 [dnl
 AC_REQUIRE([RTEMS_TOP])dnl
 AC_REQUIRE([RTEMS_CHECK_CPU])dnl

aclocal/check-tool.m4

@@ -3,7 +3,7 @@ dnl $Id$
 ## Check for a cross tool, similar to AC_CHECK_TOOL, but do not fall back to
 ## the un-prefixed version of PROG-TO-CHECK-FOR.
 dnl RTEMS_CHECK_TOOL(VARIABLE, PROG-TO-CHECK-FOR[, VALUE-IF-NOT-FOUND [, PATH]])
-AC_DEFUN(RTEMS_CHECK_TOOL,
+AC_DEFUN([RTEMS_CHECK_TOOL],
 [
   AS_IF([test "x$build_alias" != "x$host_alias"],
     [rtems_tool_prefix=${ac_tool_prefix}])

aclocal/config-subdirs.m4

@@ -11,7 +11,7 @@ dnl
 dnl
 dnl _AC_DOTS(PATH)
 dnl
-AC_DEFUN(_AC_DOTS,[
+AC_DEFUN([_AC_DOTS],[
 # A "../" for each directory in $1.
     ac_dots=`echo $1 | \
              sed -e 's%^\./%%' -e 's%[[^/]]$%&/%' -e 's%[[^/]]*/%../%g'`
@@ -20,7 +20,7 @@ AC_DEFUN(_AC_DOTS,[
 dnl
 dnl _RTEMS_ADJUST_SRCDIR(REVAR,CONFIG_DIR[,TARGET_SUBDIR])
 dnl
-AC_DEFUN(_RTEMS_ADJUST_SRCDIR,[
+AC_DEFUN([_RTEMS_ADJUST_SRCDIR],[
     _AC_DOTS(ifelse([$3], ,[$2],[$3/$2]))
 
     case "$srcdir" in

aclocal/enable-bare.m4

@@ -1,4 +1,4 @@
-AC_DEFUN(RTEMS_ENABLE_BARE,
+AC_DEFUN([RTEMS_ENABLE_BARE],
 [
 AC_ARG_ENABLE(bare-cpu-cflags,
 [AC_HELP_STRING([--enable-bare-cpu-cflags],

aclocal/enable-cxx.m4

@@ -1,6 +1,6 @@
 dnl $Id$
 
-AC_DEFUN(RTEMS_ENABLE_CXX,
+AC_DEFUN([RTEMS_ENABLE_CXX],
 [
 AC_ARG_ENABLE(cxx,
 [AC_HELP_STRING([--enable-cxx],

aclocal/enable-inlines.m4

@@ -1,6 +1,6 @@
 dnl $Id$
 
-AC_DEFUN(RTEMS_ENABLE_INLINES,
+AC_DEFUN([RTEMS_ENABLE_INLINES],
 [AC_ARG_ENABLE(rtems-inlines,
 [AC_HELP_STRING([--enable-rtems-inlines],
 [enable RTEMS inline functions (default:enabled, disable to use macros)])],

aclocal/enable-itron.m4

@@ -1,6 +1,6 @@
 dnl $Id$
 
-AC_DEFUN(RTEMS_ENABLE_ITRON,
+AC_DEFUN([RTEMS_ENABLE_ITRON],
 [
 ## AC_BEFORE([$0], [RTEMS_CHECK_ITRON_API])dnl
 

aclocal/enable-multiprocessing.m4

@@ -1,6 +1,6 @@
 dnl $Id$
 
-AC_DEFUN(RTEMS_ENABLE_MULTIPROCESSING,
+AC_DEFUN([RTEMS_ENABLE_MULTIPROCESSING],
 [
 AC_ARG_ENABLE(multiprocessing,
 [AC_HELP_STRING([--enable-multiprocessing],

aclocal/enable-networking.m4

@@ -1,6 +1,6 @@
 dnl $Id$
 
-AC_DEFUN(RTEMS_ENABLE_NETWORKING,
+AC_DEFUN([RTEMS_ENABLE_NETWORKING],
 [
 ## AC_BEFORE([$0], [RTEMS_CHECK_NETWORKING])dnl
 

aclocal/enable-posix.m4

@@ -1,6 +1,6 @@
 dnl $Id$
 
-AC_DEFUN(RTEMS_ENABLE_POSIX,
+AC_DEFUN([RTEMS_ENABLE_POSIX],
 [
 ## AC_BEFORE([$0], [RTEMS_CHECK_POSIX_API])dnl
 

aclocal/enable-rdbg.m4

@@ -1,6 +1,6 @@
 dnl $Id$
 
-AC_DEFUN(RTEMS_ENABLE_RDBG,
+AC_DEFUN([RTEMS_ENABLE_RDBG],
 [
 AC_BEFORE([$0], [RTEMS_CHECK_RDBG])dnl
 

aclocal/enable-rtemsbsp.m4

@@ -3,7 +3,7 @@ dnl $Id$
 dnl Override the set of BSPs to be built.
 dnl used by the toplevel configure script
 dnl RTEMS_ENABLE_RTEMSBSP(rtems_bsp_list)
-AC_DEFUN(RTEMS_ENABLE_RTEMSBSP,
+AC_DEFUN([RTEMS_ENABLE_RTEMSBSP],
 [
 AC_BEFORE([$0], [RTEMS_ENV_RTEMSBSP])
 AC_ARG_ENABLE(rtemsbsp,

aclocal/enable-tests.m4

@@ -1,6 +1,6 @@
 dnl $Id$
 
-AC_DEFUN(RTEMS_ENABLE_TESTS,
+AC_DEFUN([RTEMS_ENABLE_TESTS],
 [
 # If the tests are enabled, then find all the test suite Makefiles
 AC_MSG_CHECKING([if the test suites are enabled? ])

aclocal/env-rtemsbsp.m4

@@ -2,7 +2,7 @@ dnl $Id$
 
 dnl Pass a single BSP via an environment variable
 dnl used by per BSP configure scripts
-AC_DEFUN(RTEMS_ENV_RTEMSBSP,
+AC_DEFUN([RTEMS_ENV_RTEMSBSP],
 [dnl
 AC_BEFORE([$0], [RTEMS_ENABLE_RTEMSBSP])dnl
 AC_BEFORE([$0], [RTEMS_PROJECT_ROOT])dnl

aclocal/gcc-isystem.m4

@@ -4,7 +4,7 @@ dnl
 dnl Check whether the gcc accepts -isystem
 dnl
 
-AC_DEFUN(RTEMS_GCC_ISYSTEM,
+AC_DEFUN([RTEMS_GCC_ISYSTEM],
 [AC_REQUIRE([RTEMS_PROG_CC])
 AC_CACHE_CHECK(whether $CC accepts -isystem,rtems_cv_gcc_isystem,
 [

aclocal/gcc-pipe.m4

@@ -4,7 +4,7 @@ dnl
 dnl Check whether the target compiler accepts -pipe
 dnl
 
-AC_DEFUN(RTEMS_GCC_PIPE,
+AC_DEFUN([RTEMS_GCC_PIPE],
 [AC_REQUIRE([RTEMS_PROG_CC]) 
 AC_REQUIRE([AC_CANONICAL_HOST])
 AC_CACHE_CHECK(whether $CC accepts --pipe,rtems_cv_gcc_pipe,

aclocal/gcc-specs.m4

@@ -4,7 +4,7 @@ dnl
 dnl Check whether the target compiler accepts -specs
 dnl
 
-AC_DEFUN(RTEMS_GCC_SPECS,
+AC_DEFUN([RTEMS_GCC_SPECS],
 [AC_REQUIRE([RTEMS_PROG_CC])
 AC_CACHE_CHECK(whether $CC accepts -specs,rtems_cv_gcc_specs,
 [

aclocal/i386-gas-code16.m4

@@ -5,7 +5,7 @@ dnl
 dnl check for i386 gas supporting 16 bit mode
 dnl     - binutils 2.9.1.0.7 and higher
 
-AC_DEFUN(RTEMS_I386_GAS_CODE16,
+AC_DEFUN([RTEMS_I386_GAS_CODE16],
 [ if test "${host_cpu}" = "i386"; then
     AC_CACHE_CHECK([for 16 bit mode assembler support],
       rtems_cv_prog_gas_code16,

aclocal/multilib.m4

@@ -2,7 +2,7 @@ dnl This provides configure definitions used for multilib support
 
 dnl parts of these macros are derived from newlib-1.8.2's multilib support
 
-AC_DEFUN(RTEMS_ENABLE_MULTILIB,
+AC_DEFUN([RTEMS_ENABLE_MULTILIB],
 [
 AC_ARG_ENABLE(multilib,
 AC_HELP_STRING([--enable-multilib],

aclocal/path-ksh.m4

@@ -1,6 +1,6 @@
 dnl $Id$
 
-AC_DEFUN(RTEMS_PATH_KSH,
+AC_DEFUN([RTEMS_PATH_KSH],
 [
 dnl NOTE: prefer bash over ksh over sh
 AC_PATH_PROGS(KSH,bash ksh sh)

aclocal/path-perl.m4

@@ -1,6 +1,6 @@
 dnl $Id$
 
-AC_DEFUN(RTEMS_PATH_PERL,
+AC_DEFUN([RTEMS_PATH_PERL],
 [
 AC_PATH_PROG(PERL,perl)
 if test -z "$PERL" ; then

aclocal/ppc.m4

@@ -80,7 +80,7 @@ if test "$no_recursion" != yes; then
         AC_MSG_ERROR([$ac_sub_configure failed for $ac_subdir])
     fi
 
-    cd $ac_popdir
+    cd "$ac_popdir"
   done
 fi
 ])

aclocal/prog-cc.m4

@@ -4,7 +4,7 @@ dnl
 dnl Check for target gcc
 dnl
 
-AC_DEFUN(RTEMS_PROG_CC,
+AC_DEFUN([RTEMS_PROG_CC],
 [
 AC_BEFORE([$0], [AC_PROG_CPP])dnl
 AC_BEFORE([$0], [AC_PROG_CC])dnl
@@ -22,7 +22,7 @@ AC_PROG_CPP
 AM_CONDITIONAL(RTEMS_USE_GCC,test x"$GCC" = x"yes")
 ])
 
-AC_DEFUN(RTEMS_PROG_CC_FOR_TARGET,
+AC_DEFUN([RTEMS_PROG_CC_FOR_TARGET],
 [
 dnl check target cc
 RTEMS_PROG_CC

aclocal/prog-cxx.m4

@@ -4,7 +4,7 @@ dnl
 dnl Check for target g++
 dnl 
 
-AC_DEFUN(RTEMS_PROG_CXX_FOR_TARGET,
+AC_DEFUN([RTEMS_PROG_CXX_FOR_TARGET],
 [
 AC_BEFORE([$0], [RTEMS_CANONICALIZE_TOOLS])dnl
 AC_REQUIRE([RTEMS_ENABLE_CXX])

aclocal/project-root.m4

@@ -12,7 +12,7 @@ dnl RTEMS_ROOT         .. path to the top of a bsp's build directory
 dnl                       [Applied by custom/*.cfg, depredicated otherwise]
 dnl
 
-AC_DEFUN(RTEMS_PROJECT_ROOT,
+AC_DEFUN([RTEMS_PROJECT_ROOT],
 [dnl
 AC_REQUIRE([RTEMS_TOP])
 

aclocal/rtems-debug.m4

@@ -1,6 +1,6 @@
 ## $Id$
 
-AC_DEFUN(RTEMS_ENABLE_RTEMS_DEBUG,
+AC_DEFUN([RTEMS_ENABLE_RTEMS_DEBUG],
 [
 AC_ARG_ENABLE(rtems-debug,
 AC_HELP_STRING([--enable-rtems-debug],[enable RTEMS_DEBUG]),
@@ -11,7 +11,7 @@ AC_HELP_STRING([--enable-rtems-debug],[enable RTEMS_DEBUG]),
 esac],[enable_rtems_debug=no])
 ])
 
-AC_DEFUN(RTEMS_CHECK_RTEMS_DEBUG,
+AC_DEFUN([RTEMS_CHECK_RTEMS_DEBUG],
 [AC_REQUIRE([RTEMS_ENABLE_RTEMS_DEBUG])
 AS_IF([test x"${enable_rtems_debug}" = x"yes"]
   [AC_DEFINE_UNQUOTED(RTEMS_DEBUG,1,[if RTEMS_DEBUG is enabled])])

aclocal/rtems-test-no-pause.m4

@@ -1,4 +1,4 @@
-AC_DEFUN(RTEMS_ENABLE_RTEMS_TEST_NO_PAUSE,
+AC_DEFUN([RTEMS_ENABLE_RTEMS_TEST_NO_PAUSE],
 [AC_ARG_ENABLE(test-no-pause,
 AC_HELP_STRING([--disable-test-no-pause],[disable RTEMS_TEST_NO_PAUSE]),
 [case "${enableval}" in
@@ -8,7 +8,7 @@ AC_HELP_STRING([--disable-test-no-pause],[disable RTEMS_TEST_NO_PAUSE]),
 esac],[RTEMS_TEST_NO_PAUSE=yes])
 ])
 
-AC_DEFUN(RTEMS_CHECK_RTEMS_TEST_NO_PAUSE,
+AC_DEFUN([RTEMS_CHECK_RTEMS_TEST_NO_PAUSE],
 [AC_REQUIRE([RTEMS_ENABLE_RTEMS_TEST_NO_PAUSE])
 if test x"${RTEMS_TEST_NO_PAUSE}" = x"yes";
 then

aclocal/rtems-top.m4

@@ -7,7 +7,7 @@ dnl RTEMS_TOP($1)
 dnl 
 dnl $1 .. relative path from this configure.in to the toplevel configure.in
 dnl
-AC_DEFUN(RTEMS_TOP,
+AC_DEFUN([RTEMS_TOP],
 [dnl
 AC_REQUIRE([RTEMS_VERSIONING])
 AC_CONFIG_AUX_DIR([$1])

aclocal/target.m4

@@ -2,7 +2,7 @@ dnl $Id$
 
 ## HACK: Work-around to structural issue with RTEMS
 ## The macros below violate most autoconf and canonicalization standards
-AC_DEFUN(RTEMS_CONFIG_BUILD_SUBDIRS,
+AC_DEFUN([RTEMS_CONFIG_BUILD_SUBDIRS],
 [AC_REQUIRE([_RTEMS_OUTPUT_BUILD_SUBDIRS])
 RTEMS_BUILD_SUBDIRS="$RTEMS_BUILD_SUBDIRS [$1]"
 ])
@@ -86,7 +86,7 @@ dnl
 dnl
 dnl _RTEMS_PUSH_BUILDDIR(SUBDIR)
 dnl
-AC_DEFUN(_RTEMS_PUSH_BUILDDIR,
+AC_DEFUN([_RTEMS_PUSH_BUILDDIR],
 [
 # _RTEMS_PUSH_BUILDDIR
     echo configuring in $1
@@ -103,15 +103,15 @@ AC_DEFUN(_RTEMS_PUSH_BUILDDIR,
 dnl
 dnl _RTEMS_POP_BUILDDIR
 dnl
-AC_DEFUN(_RTEMS_POP_BUILDDIR,
+AC_DEFUN([_RTEMS_POP_BUILDDIR],
 [
-  cd $ac_popdir
+  cd "$ac_popdir"
 ])
 
 dnl
 dnl _RTEMS_GIVEN_INSTALL
 dnl
-AC_DEFUN(_RTEMS_GIVEN_INSTALL,
+AC_DEFUN([_RTEMS_GIVEN_INSTALL],
 [
 ifdef([AC_PROVIDE_AC_PROG_INSTALL],[  
   case "$ac_given_INSTALL" in
@@ -124,7 +124,7 @@ ifdef([AC_PROVIDE_AC_PROG_INSTALL],[
 dnl
 dnl _RTEMS_SUB_SRCDIR(AC_CONFIG_DIR[,TARGET_SUBDIR])
 dnl
-AC_DEFUN(_RTEMS_SUB_SRCDIR,[
+AC_DEFUN([_RTEMS_SUB_SRCDIR],[
 # _RTEMS_SUB_SRCDIR
     _RTEMS_ADJUST_SRCDIR(ac_sub_srcdir,$1,$2)
 

aclocal/tool-paths.m4

@@ -1,4 +1,4 @@
-AC_DEFUN(RTEMS_TOOLPATHS,
+AC_DEFUN([RTEMS_TOOLPATHS],
 [
 # tooldir='$(exec_prefix)/'$target_alias
 # Temporary work-around until building in source tree is supported

aclocal/version.m4

@@ -1,2 +1,2 @@
 AC_DEFUN([RTEMS_VERSIONING],
-m4_define([_RTEMS_VERSION],[4.6.1]))
+m4_define([_RTEMS_VERSION],[4.6.2]))

c/src/ChangeLog

@@ -1,3 +1,7 @@
+2004-08-17	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* acinclude.m4 (_RTEMS_CONFIG_SUBDIR): Quote ac_popdir uses.
+
 2003-12-14	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* support/Makefile.am: Pass @RTEMS_BSP@ to AM_CPPFLAGS.

c/src/acinclude.m4

@@ -79,7 +79,7 @@ if test "$no_recursion" != yes; then
         AC_MSG_ERROR([$ac_sub_configure failed for $ac_subdir])
     fi
 
-    cd $ac_popdir
+    cd "$ac_popdir"
   done
 fi
 fi

c/src/lib/libbsp/i386/i386ex/ChangeLog

@@ -1,3 +1,8 @@
+2004-09-27	Joel Sherrill <joel@OARcorp.com>
+
+	PR 679/bsps
+	* startup/linkcmds: Add gnu.linkonce.d and .gcc_except_table.
+
 2003-09-04	Joel Sherrill <joel@OARcorp.com>
 
 	* clock/ckinit.c, console/console.c, include/bsp.h, include/coverhd.h,

c/src/lib/libbsp/i386/i386ex/startup/linkcmds

@@ -48,6 +48,8 @@ SECTIONS
         {
         _sdata = .;
         *(.data);
+	*(.gnu.linkonce.d*)
+	*(.gcc_except_table)
         _edata = .;
    	}
         _data_start       = ADDR(.data) ;

c/src/lib/libbsp/i386/pc386/ChangeLog

@@ -1,3 +1,16 @@
+2004-10-13	Eric Norum <norume@aps.anl.gov>
+
+	PR 688/bsps
+	* Makefile.am clock/todcfg.c: Add support for MC146818A TOD chip.
+
+2004-05-21  Till Strauman <strauman@slac.stanford.edu>
+
+	* PR 624/bsps
+	startup/bspstart.c: When probing the memory, make sure not to
+	corrupt the application. Only probe addresses beyond rtemsFreeMemStart.
+	* Let IBMPC_outch() convert LF -> CRLF to avoid printk scrambling
+	the screen.
+
 2003-10-02	Till Strauman <strauman@slac.stanford.edu>
 
 	PR 502/bsps

c/src/lib/libbsp/i386/pc386/clock/Makefile.am

@@ -2,10 +2,11 @@
 ## $Id$
 ##
 
+VPATH = @srcdir@:@srcdir@/../../shared/tod:@srcdir@/../../../shared
 
 PGM = $(ARCH)/clock.rel
 
-C_FILES = ckinit.c rtc.c
+C_FILES = ckinit.c todcfg.c tod.c
 clock_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 
 include $(top_srcdir)/../../../../../../automake/compile.am
@@ -25,6 +26,6 @@ all-local: $(ARCH) $(clock_rel_OBJECTS) $(PGM)
 
 .PRECIOUS: $(PGM)
 
-EXTRA_DIST = ckinit.c rtc.c
+EXTRA_DIST = 
 
 include $(top_srcdir)/../../../../../../automake/local.am

c/src/lib/libbsp/i386/pc386/clock/todcfg.c

@@ -0,0 +1,36 @@
+/*
+ * This file contains the RTC driver table for Motorola shared BSPs.
+ *
+ * The license and distribution terms for this file may be
+ * found in the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
+#include <bsp.h>
+#include <libchip/rtc.h>
+#include <libchip/mc146818a.h>
+
+/* The following table configures the RTC drivers used in this BSP */
+rtc_tbl RTC_Table[] = {
+    {
+        "/dev/rtc",                /* sDeviceName */
+        RTC_MC146818A,             /* deviceType */
+        &mc146818a_fns,            /* pDeviceFns */
+        mc146818a_probe,           /* deviceProbe */
+        NULL,                      /* pDeviceParams */
+        0x70,                      /* ulCtrlPort1 */
+        0x00,                      /* ulDataPort */
+        mc146818a_get_register,    /* getRegister */
+        mc146818a_set_register     /* setRegister */
+    }
+};
+
+/* Some information used by the RTC driver */
+
+#define NUM_RTCS (sizeof(RTC_Table)/sizeof(rtc_tbl))
+
+unsigned long RTC_Count = NUM_RTCS;
+
+rtems_device_minor_number RTC_Minor;

c/src/lib/libbsp/i386/pc386/console/outch.c

@@ -270,8 +270,11 @@ _IBMPC_outch(char c)
 {
 static int escaped = 0;
 
-  if ( ! (escaped = handleEscape(escaped, c)) )
+  if ( ! (escaped = handleEscape(escaped, c)) ) {
+    if ( '\n' == c )
+      videoPutChar('\r');
   	videoPutChar(c);
+  }
 } /* _IBMPC_outch */
 
 

c/src/lib/libbsp/i386/pc386/startup/bspstart.c

@@ -82,12 +82,18 @@ void bsp_postdriver_hook(void);
 void bsp_pretasking_hook(void)
 {
   rtems_unsigned32 topAddr, val;
-  int i;
+  int i, lowest;
   
   
   if (rtemsFreeMemStart & (CPU_ALIGNMENT - 1))  /* not aligned => align it */
     rtemsFreeMemStart = (rtemsFreeMemStart+CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1);
 
+  /* find the lowest 1M boundary to probe */
+  lowest = ((rtemsFreeMemStart + (1<<20)) >> 20) + 1;
+  if ( lowest  < 2 )
+	lowest = 2;
+
+
   if(_heap_size == 0)
     {
       /* 
@@ -95,13 +101,13 @@ void bsp_pretasking_hook(void)
        * between 2M and 2048M.
        * let us first write
        */
-      for(i=2048; i>=2; i--)
+      for(i=2048; i>=lowest; i--)
 	{
 	  topAddr = i*1024*1024 - 4;
 	  *(volatile rtems_unsigned32 *)topAddr = topAddr;
 	}
 
-      for(i=2; i<=2048; i++)
+      for(i=lowest; i<=2048; i++)
 	{
 	  topAddr = i*1024*1024 - 4;
 	  val =  *(rtems_unsigned32 *)topAddr;

c/src/lib/libbsp/i386/shared/ChangeLog

@@ -1,3 +1,8 @@
+2003-11-01      Greg Menke <gregory.menke@gsfc.nasa.gov>
+
+	PR 608/bsps
+	* pci/pcibios.c: BusCountPCI().
+
 2003-12-29	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* shared/io/Makefile.am: Remove (Unused).

c/src/lib/libbsp/i386/shared/pci/pcibios.c

@@ -218,6 +218,64 @@ pcib_find_by_class(int classCode, int idx, int *sig)
 #define PCI_MAX_DEVICES		 16
 #define PCI_MAX_FUNCTIONS	 8
 
+#define PCI_VENDOR_ID           0x00    /* 16 bits */
+#define PCI_DEVICE_ID           0x02    /* 16 bits */
+#define PCI_CLASS_REVISION      0x08
+#define PCI_HEADER_TYPE         0x0e  
+#define PCI_SUBORDINATE_BUS     0x1a 
+
+#define  PCI_CLASS_BRIDGE_PCI           0x0604
+
+static unsigned8 ucBusCount = 0xff;
+
+int
+BusCountPCI()
+{
+   if( ucBusCount == 0xff )
+   {
+      unsigned char bus,dev,hd;
+      unsigned int d;
+      int sig;
+
+      ucBusCount = 0;
+
+      for(bus=0; bus< 0xff; bus++)
+      {  
+         for(dev=0; dev<PCI_MAX_DEVICES; dev++)
+         {
+            sig = PCIB_DEVSIG_MAKE(bus,dev,0);
+            pcib_conf_read32(sig, PCI_VENDOR_ID, &d); 
+
+            if( d != -1 )
+            {
+               pcib_conf_read32(sig, PCI_CLASS_REVISION, &d); 
+               
+               if( (d >> 16) == PCI_CLASS_BRIDGE_PCI )
+               {
+                  pcib_conf_read8(sig, PCI_SUBORDINATE_BUS, &hd); 
+
+                  if( hd > ucBusCount ) 
+                     ucBusCount = hd;
+               }
+            }
+         }
+         
+      }
+
+      if( ucBusCount == 0 )
+      {
+         printk("BusCountPCI() found 0 busses, assuming 1\n");
+         ucBusCount = 1;
+      }
+      else if( ucBusCount == 0xff )
+      {
+         printk("BusCountPCI() found 0xff busses, assuming 1\n");
+         ucBusCount = 1;
+      }
+   }                       
+
+   return ucBusCount;
+}
 
 int
 BSP_pciFindDevice( unsigned short vendorid, unsigned short deviceid,

c/src/lib/libbsp/powerpc/gen405/ChangeLog

@@ -1,3 +1,8 @@
+2004-10-15	Gene Smith <gene.smith@seimens.com>
+
+	PR 691/bsps
+	* startup/linkcmds: Correct bug in linker script.
+
 2003-12-16	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	PR 533/bsps

c/src/lib/libbsp/powerpc/gen405/startup/linkcmds

@@ -145,7 +145,6 @@ SECTIONS
   PROVIDE(_heap_end = heap.end);
   /* reserve 64KByte for stack... */
   stack.end = heap.end + 64K;
-  PROVIDE(_end = stack.end);
 
   .line 0 : { *(.line) }
   .debug 0 : { *(.debug) }

c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog

@@ -1,3 +1,8 @@
+2004-09-27	Joel Sherrill <joel@OARcorp.com>
+
+	PR 680/bsps
+	* network/if_hdlcsubr.c: Add missing #include <rtems/rtems_bsdnet.h>.
+
 2004-04-07	Joel Sherrill <joel@OARcorp.com>
 
 	PR 602/bsps

c/src/lib/libbsp/powerpc/mpc8260ads/network/if_hdlcsubr.c

@@ -48,6 +48,8 @@
  * $Id$
  */
 
+#include <rtems/rtems_bsdnet.h>
+
 #include <sys/param.h>
 /*#include <sys/systm.h>
 #include <sys/kernel.h> */

c/src/lib/libbsp/powerpc/shared/ChangeLog

@@ -1,97 +1,26 @@
-2004-03-31	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+2004-09-27      Greg Menke <gregory.menke@gsfc.nasa.gov>
 
-	* startup/Makefile.am: Remove references to linkcmds.
+	PR 606/bsps
+	* bootloader/pci.c: Fixed IO remapping so buses >= 1 are remapped.
+	Reduced PCI space to match bat2.  Fixed incorrect region size
+	calculation in pci_read_bases.  Set PCI latency timers to known
+	sane values.  Changed bridge PCI settings to minimum sane instead
+	of whatever sounded neat in the PCI spec.  Force pf regions to
+	memory mapped to preserve byte access.
 
-2004-02-10	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
-	PR 575/bsps
-	* startup/linkcmds: Remove.
+2004-09-27      Greg Menke <gregory.menke@gsfc.nasa.gov>
 
-2003-10-22	Joel Sherrill <joel@OARcorp.com>
-
-	PR 510/bsps
-	* irq/irq.h: Add extern C wrapper.
-
-2003-09-29	Till Strauman <strauman@slac.stanford.edu>
-
-	PR 497/bsps
-	* ChangeLog, bootloader/head.S, startup/bspstart.c: Disable code that
-	returned to the firmware when the loader starts.
-	* startup/sbrk.c: New file.
-
-2003-09-26	Till Strauman <strauman@slac.stanford.edu>
-
-	PR 496/bsps
-	* startup/sbrk.c: New file.
-	* startup/bspstart.c: This patch implements 'sbrk'
-	for the powerpc-shared BSP to work around what's known as the
-	'32Mb problem' in combination with run-time loaded code.
-	GCC normally generates (PowerPC) code doing 'short jumps' which
-	requires all text segments being in the same 32Mb area of memory.
-	However, some run-time loaders use (e.g. heap-) memory violating the
-	stated limitation on hardware with more than 32Mb of memory.
-	(NOTE: portable loaders are probably not even aware of this
-	GCC/CPU specific problem.)
-
-	This patch implements a simple workaround: At boot time, the system is
-	only provided with 32Mb of memory. The user is supposed to load all
-	necessary modules prior to that limit being exhausted. Once that
-	happens, newlib/malloc end up trying to 'sbrk()' for more memory and
-	the implementation provided by this patch will then make the rest of
-	the physical memory available.
-
-2003-09-26  Till Straumann <strauman@slac.stanford.edu>
-
-	PR 497/bsps
-	* bootloader/head.S: Let the bootloader shut down the
-	network interface. NOTE: this involves a PPCBug system
-	call and will hence fail if other software is used
-	to boot. Need to #undef USE_PPCBUG in such cases!
-  
-2003-09-04	Joel Sherrill <joel@OARcorp.com>
-
-	* bootloader/bootldr.h, bootloader/em86.c, bootloader/em86real.S,
-	bootloader/exception.S, bootloader/head.S, bootloader/lib.c,
-	bootloader/misc.c, bootloader/mm.c, bootloader/pci.c,
-	clock/p_clock.c, console/console.c, console/consoleIo.h,
-	console/inch.c, console/keyboard.h, console/polled_io.c,
-	include/bsp.h, irq/i8259.c, irq/irq.c, irq/irq.h, irq/irq_asm.S,
-	irq/irq_init.c, motorola/motorola.c, motorola/motorola.h,
-	openpic/openpic.c, openpic/openpic.h, pci/pci.c, residual/residual.c,
-	start/start.S, startup/bspstart.c, vectors/vectors.h,
-	vectors/vectors_init.c: URL for license changed.
-
-2003-08-21	Till Strauman <strauman@slac.stanford.edu>
-
-	PR 456/bsps
-	* irq/irq.c: Fix race condition when installing an ISR.
-
-2003-08-05	Till Strauman <strauman@slac.stanford.edu>
-
-	PR 437/bsps
-	* irq/irc.c: calls to bspIo/printk must not use '%i' format which is
-	apparently not supported 
-        * pci/pci.c: calls to bspIo/printk must not use '%i' format which is
-	apparently not supported 
-
-2003-07-18	Till Straumann <strauman@slac.stanford.edu>
-
-	PR 288/rtems
-	* irq/irq_asm.S, startup/bspstart.c: _ISR_Nest_level is now properly
-	maintained and any BSP which does not do so will trip a panic in the
-	shared code.
-
-2003-07-18	Till Straumann <strauman@slac.stanford.edu>
-
-	PR 415/bsps
-	* pci/detect_raven_bridge.c, startup/bspstart.c:
-	This patch reverts enabling MCP interrupts for the motorola_powerpc
-	BSPs. REASON: pci config space scanning (as e.g. done by the DEC
-	Ethernet driver) would raise machine check exceptions.
+	PR 606/bsps
+	* bootloader/pci.c: Fixed IO remapping so buses >= 1 are remapped.
+	Reduced PCI space to match bat2.  Fixed incorrect region size
+	calculation in pci_read_bases.  Set PCI latency timers to known
+	sane values.  Changed bridge PCI settings to minimum sane instead
+	of whatever sounded neat in the PCI spec.  Force pf regions to
+	memory mapped to preserve byte access.
 
 2003-07-16      Greg Menke <gregory.menke@gsfc.nasa.gov>
 
-	PR 428/bsps
 	PR 432/bsps
 	* bootloader/pci.c: Re-instated code that prevents remapping small
 	IO regions, which if remapped would cause i8259 registers to move
@@ -124,6 +53,16 @@
 	Support enabling MCP exceptions on the host bridge. This can
 	be used for memory probing on the VME bus.
 
+2003-04-15	Joel Sherrill <joel@OARcorp.com>
+
+	PR 386/bsps
+	* vme/vmeconfig.c: Removed declaration of _BSP_vme_bridge_irq.
+
+2003-04-15	Joel Sherrill <joel@OARcorp.com>
+
+	PR 386/bsps
+	* vme/vmeconfig.c: Removed declaration of _BSP_vme_bridge_irq.
+
 2003-04-10  Till Straumann <strauman@slac.stanford.edu>
 
 	PR 379/bsps
@@ -165,6 +104,22 @@
 	code on non-VME BSPs without triggering linkage of the vmeUniverse
 	driver.
 
+2003-03-25  Till Straumann <strauman@slac.stanford.edu>
+
+	PR 349/bsps
+	* irq/irq.c, vme/VME.h, vme/vmeconfig.c: Fixes library dependency
+	on the vmeUniverse driver. It is now possible to use the ppc/shared/irq
+	code on non-VME BSPs without triggering linkage of the vmeUniverse
+	driver.
+
+2003-03-25  Till Straumann <strauman@slac.stanford.edu>
+
+	PR 349/bsps
+	* irq/irq.c, vme/VME.h, vme/vmeconfig.c: Fixes library dependency
+	on the vmeUniverse driver. It is now possible to use the ppc/shared/irq
+	code on non-VME BSPs without triggering linkage of the vmeUniverse
+	driver.
+
 2003-03-18  Till Straumann <strauman@slac.stanford.edu>
 
 	PR 356/bsps

c/src/lib/libbsp/powerpc/shared/bootloader/pci.c

@@ -12,7 +12,7 @@
  *  found in found in the file LICENSE in this distribution or at
  *  http://www.rtems.com/license/LICENSE.
  *
- * $Id$
+ * pci.c,v 1.3 2003/06/13 17:39:44 joel Exp
  */
 
 
@@ -25,17 +25,13 @@
 #include <libcpu/page.h>
 #include <bsp/consoleIo.h>
 
-
-
 typedef unsigned int u32;
 
-
 /*
 #define DEBUG
 #define PCI_DEBUG
 */
 
-
 /* Used to reorganize PCI space on stupid machines which spread resources
  * across a wide address space. This is bad when P2P bridges are present
  * or when it limits the mappings that a resource hog like a PCI<->VME
@@ -234,8 +230,12 @@ static void insert_resource(pci_resource *r) {
    ** hardware, its just the builtin stuff we're tiptoeing around.
    ** 
    ** Gregm, 7/16/2003
+   **
+   ** Gregm, changed 11/2003 so IO devices only on bus 0 zero are not
+   ** remapped.  This covers the builtin pc-like io devices- but
+   ** properly maps IO devices on higher busses.
    */
-   if( r->dev->bus->number <= 1 )
+   if( r->dev->bus->number == 0 )
    {
    if ((r->type==PCI_BASE_ADDRESS_SPACE_IO) 
        ? (r->base && r->base <0x10000)
@@ -508,11 +508,11 @@ static void reconfigure_bus_space(u_char bus, u_char type, pci_area_head *h)
 #define BUS0_IO_START           0x10000
 #define BUS0_IO_END             0x1ffff
 #define BUS0_MEM_START          0x1000000
-#define BUS0_MEM_END            0xaffffff
+#define BUS0_MEM_END            0x3f00000
 
 #define BUSREST_IO_START        0x20000
 #define BUSREST_IO_END          0x7ffff
-#define BUSREST_MEM_START       0xb000000
+#define BUSREST_MEM_START       0x4000000
 #define BUSREST_MEM_END        0x10000000
 
 
@@ -570,8 +570,7 @@ static void reconfigure_pci(void) {
           (PCI_BASE_ADDRESS_SPACE_MEMORY|
            PCI_BASE_ADDRESS_MEM_TYPE_64)) {
          pci_write_config_dword(r->dev,
-                                PCI_BASE_ADDRESS_1+
-                                (r->reg<<2),
+                                PCI_BASE_ADDRESS_1+(r->reg<<2),
                                 0);
       }
    }
@@ -809,12 +808,31 @@ void pci_read_bases(struct pci_dev *dev, unsigned int howmany)
       if ((l&PCI_BASE_ADDRESS_SPACE) == PCI_BASE_ADDRESS_SPACE_IO) {
          r->type = l&~PCI_BASE_ADDRESS_IO_MASK;
          r->base = l&PCI_BASE_ADDRESS_IO_MASK;
-         r->size = ~(ml&PCI_BASE_ADDRESS_IO_MASK)+1;
+         /* r->size = ~(ml&PCI_BASE_ADDRESS_IO_MASK)+1; */
       } else {
          r->type = l&~PCI_BASE_ADDRESS_MEM_MASK;
          r->base = l&PCI_BASE_ADDRESS_MEM_MASK;
-         r->size = ~(ml&PCI_BASE_ADDRESS_MEM_MASK)+1;
+         /* r->size = ~(ml&PCI_BASE_ADDRESS_MEM_MASK)+1; */
       }
+
+      /* find the first bit set to one after the base
+         address type bits to find length of region */
+      {
+         unsigned int c= 16 , val= 0;
+         while( !(val= ml & c) ) c <<= 1;
+         r->size = val;
+      }
+
+#ifdef PCI_DEBUG
+      printk("   readbase bus %d, (%04x:%04x), base %08x, size %08x, type %d\n",
+             r->dev->bus->number, 
+             r->dev->vendor,
+             r->dev->device,
+             r->base,
+             r->size,
+             r->type );
+#endif
+
       /* Check for the blacklisted entries */
       insert_resource(r);
    }
@@ -1177,6 +1195,9 @@ static void recursive_bus_reconfigure( struct pci_bus *pbus )
    {
       pdev= childbus->self;
 
+      pcibios_write_config_byte(pdev->bus->number, pdev->devfn, PCI_LATENCY_TIMER,     0x80 );
+      pcibios_write_config_byte(pdev->bus->number, pdev->devfn, PCI_SEC_LATENCY_TIMER, 0x80 );
+
       {
          struct _addr_start   addrhold;
          unsigned8            base8, limit8;
@@ -1200,7 +1221,7 @@ static void recursive_bus_reconfigure( struct pci_bus *pbus )
    
 
          /* 
-         **use the current values & the saved ones to figure out
+         ** use the current values & the saved ones to figure out
          ** the address spaces for the bridge
          */
 
@@ -1253,6 +1274,7 @@ static void recursive_bus_reconfigure( struct pci_bus *pbus )
 
 
 
+
          if( astart.start_prefetch == addrhold.start_prefetch )
          {
             limit16 = 0;
@@ -1272,18 +1294,20 @@ static void recursive_bus_reconfigure( struct pci_bus *pbus )
          pcibios_write_config_word(pdev->bus->number, pdev->devfn, PCI_PREF_MEMORY_BASE, base16 );
          pcibios_write_config_dword(pdev->bus->number, pdev->devfn, PCI_PREF_LIMIT_UPPER32, 0);
          pcibios_write_config_word(pdev->bus->number, pdev->devfn, PCI_PREF_MEMORY_LIMIT, limit16 );
-
 #endif
 
 #ifdef WRITE_BRIDGE_ENABLE
-         pcibios_write_config_word(pdev->bus->number, pdev->devfn, PCI_BRIDGE_CONTROL, (unsigned16)( PCI_BRIDGE_CTL_PARITY |
-                                                                                                     PCI_BRIDGE_CTL_SERR ));
+         pcibios_write_config_word(pdev->bus->number, 
+                                   pdev->devfn, 
+                                   PCI_BRIDGE_CONTROL, 
+                                   (unsigned16)( 0 ));
 
-         pcibios_write_config_word(pdev->bus->number, pdev->devfn, PCI_COMMAND, (unsigned16)( PCI_COMMAND_IO | 
+         pcibios_write_config_word(pdev->bus->number, 
+                                   pdev->devfn, 
+                                   PCI_COMMAND, 
+                                   (unsigned16)( PCI_COMMAND_IO | 
                                                                                               PCI_COMMAND_MEMORY |
-                                                                                              PCI_COMMAND_MASTER |
-                                                                                              PCI_COMMAND_PARITY |
-                                                                                              PCI_COMMAND_SERR ));
+                                                 PCI_COMMAND_MASTER ));
 #endif
       }
    }
@@ -1319,7 +1343,18 @@ static void recursive_bus_reconfigure( struct pci_bus *pbus )
 
             while( (r= enum_device_resources( pdev, i++ )) )
             {
-               if( r->type & PCI_BASE_ADDRESS_MEM_PREFETCH )
+               /*
+               ** Force all memory spaces to be non-prefetchable because
+               ** on the pci bus, byte-wise reads against prefetchable
+               ** memory are applied as 32 bit reads, which is a pain
+               ** when you're trying to talk to hardware.  This is a
+               ** little sub-optimal because the algorithm doesn't sort
+               ** the address regions to pack them in, OTOH, perhaps its
+               ** not so bad because the inefficient packing will help
+               ** avoid buffer overflow/underflow problems.
+               */
+#if 0
+               if( (r->type & PCI_BASE_ADDRESS_MEM_PREFETCH) )
                {
                   /* prefetchable space */
 
@@ -1333,7 +1368,8 @@ static void recursive_bus_reconfigure( struct pci_bus *pbus )
                   printk("pci:       pf %08X, size %08X, alloc %08X\n", r->base, r->size, alloc );
 #endif
                }
-               else if( r->type & PCI_BASE_ADDRESS_SPACE_IO )
+#endif
+               if( r->type & PCI_BASE_ADDRESS_SPACE_IO )
                {
                   /* io space */
 
@@ -1436,6 +1472,10 @@ void pci_init(void)
    reconfigure_pci();
 
    print_pci_resources("Allocated PCI resources:\n");
+
+#if 0
+   print_pci_info();
+#endif
 }
 
 

c/src/lib/libbsp/shared/ChangeLog

@@ -1,3 +1,8 @@
+2004-10-13	Eric Norum <norume@aps.anl.gov>
+
+	PR 688/bsps
+	* shared/tod.c: Set RTEMS time during TOD initialization
+
 2003-09-26	Cedric Aubert <cedric_aubert@yahoo.fr>
 
 	PR 501/rtems_misc

c/src/lib/libbsp/shared/tod.c

@@ -98,6 +98,7 @@ rtems_device_driver rtc_initialize(
     }
   }
 
+  setRealTimeToRTEMS();
   return RTEMS_SUCCESSFUL;
 }
 

c/src/lib/libcpu/i960/include/.cvsignore

@@ -1,2 +0,0 @@
-Makefile
-Makefile.in

c/src/lib/libcpu/powerpc/ChangeLog

@@ -1,3 +1,13 @@
+2004-05-22	Till Strauman <strauman@slac.stanford.edu>
+
+	PR 619/bsps
+	* mpc6xx/clock/c_clock.c: The PPC decrementer must be reloaded on each
+	clock tick. Currently, this is done by just reloading a fixed value.
+	The attached patch takes into account the time that elapsed since the
+	decrementer crossed zero in order to adjust the value to be
+	re-loaded. Without the patch, the effective system clock cycle is
+	increased by the exception handler latency.
+
 2003-09-04	Joel Sherrill <joel@OARcorp.com>
 
 	* mpc6xx/clock/c_clock.c, mpc6xx/clock/c_clock.h,

c/src/lib/libcpu/powerpc/mpc6xx/clock/c_clock.c

@@ -73,21 +73,23 @@ void clockOn(void* unused)
  *  Return values:      NONE
  *
  */
+
 void clockIsr()
 {
+int decr;
   /*
    *  The driver has seen another tick.
    */
+  do {
+	asm volatile ("mfdec %0; add %0, %0, %1; mtdec %0":"=r"(decr):"r"(Clock_Decrementer_value));
 
-  PPC_Set_decrementer( Clock_Decrementer_value );
+	Clock_driver_ticks += 1;
 
-  Clock_driver_ticks += 1;
-
-  /*
-   *  Real Time Clock counter/timer is set to automatically reload.
-   */
-
-  rtems_clock_tick();
+	/*
+	 *  Real Time Clock counter/timer is set to automatically reload.
+	 */
+	rtems_clock_tick();
+  } while ( decr < 0 );
 }
 
 int clockIsOn(void* unused)
@@ -144,6 +146,18 @@ rtems_device_driver Clock_initialize(
   Clock_Decrementer_value = (BSP_bus_frequency/BSP_time_base_divisor)*
             (rtems_configuration_get_microseconds_per_tick()/1000);
 
+  /* set the decrementer now, prior to installing the handler 
+   * so no interrupts will happen in a while.
+   */
+  PPC_Set_decrementer( (unsigned)-1 );
+
+  /* if a decrementer exception was pending, it is cleared by
+   * executing the default (nop) handler at this point;
+   * The next exception will then be taken by our clock handler.
+   * Clock handler installation initializes the decrementer to
+   * the correct value.
+   */
+
   if (!BSP_connect_clock_handler ()) {
     printk("Unable to initialize system clock\n");
     rtems_fatal_error_occurred(1);
@@ -190,10 +204,7 @@ rtems_device_driver Clock_control(
       clockIsr();
     else if (args->command == rtems_build_name('N', 'E', 'W', ' '))
     {
-      if (!BSP_connect_clock_handler ()) {
-	printk("Error installing clock interrupt handler!\n");
-	rtems_fatal_error_occurred(1);
-      }
+		Clock_initialize(major, minor, 0);
     }
 done:
     return RTEMS_SUCCESSFUL;

c/src/lib/libcpu/powerpc/mpc8260/include/.cvsignore

@@ -1,2 +0,0 @@
-Makefile
-Makefile.in

c/src/lib/libcpu/powerpc/mpc8xx/include/.cvsignore

@@ -1,2 +0,0 @@
-Makefile
-Makefile.in

c/src/libchip/ChangeLog

@@ -1,3 +1,32 @@
+2004-10-13      Eric Norum <norume@aps.anl.gov>
+
+        PR 688/bsps
+        * rtc/rtc.h, rtc/mc146818a.c, rtc/mc146818a.h, rtc/mc146818a_ioreg.c: 
+        New files.  Add libchip driver for MC146818A (and several
+        Dallas Semiconductor) TOD chips.
+
+2004-10-13      Eric Norum <norume@aps.anl.gov>
+
+        PR 686/networking
+        * network/if_fxp.c: Fix lockup in if_fxp.c, add additional device code.
+
+2004-04-09	Greg Menke <gregory.menke@gsfc.nasa.gov>
+
+	PR 607/networking
+	* network/dec21140.c: Made PCI configuration minimum sane instead
+	of fully specifying unused PCI features.
+
+2004-05-21  Till Strauman <strauman@slac.stanford.edu>
+
+	PR 625/networking
+	* network/dec21140.c: Prevent name clashes by making 'ld_le32()' etc.
+	static inlines.  Let dec21140 attach routine return an error rather
+	than panic if no chip is detected (thus allowing for probing).
+	* network/elnk.c: Let elnk bail out if autoneg never completes
+	instead of looping forever.  Avoid divide by zero (crashed my PC).
+	* network/if_fxp.c: Enable more fxp chip variants but warn that
+	they are UNTESTED.
+
 2003-09-26	Cedric Aubert <cedric_aubert@yahoo.fr>
 
 	PR 499/rtems_misc

c/src/libchip/network/dec21140.c

@@ -243,12 +243,12 @@ extern void Wait_X_ms( unsigned int timeToWait );
 #define rtems_bsp_delay_in_bus_cycles(cycle) Wait_X_ms( cycle/100 )
 #define CPU_CACHE_ALIGNMENT_FOR_BUFFER PG_SIZE
 
-inline void st_le32(volatile unsigned32 *addr, unsigned32 value)
+static inline void st_le32(volatile unsigned32 *addr, unsigned32 value)
 {
   *(addr)=value ;
 }
 
-inline unsigned32 ld_le32(volatile unsigned32 *addr)
+static inline unsigned32 ld_le32(volatile unsigned32 *addr)
 {
   return(*addr);
 }
@@ -1061,7 +1061,10 @@ rtems_dec21140_driver_attach (struct rtems_bsdnet_ifconfig *config, int attach)
       if ( diag == PCIB_ERR_SUCCESS)
          printk( "DEC/Intel 21143 PCI network card found\n" );
       else
-         rtems_panic("DEC PCI network card not found !!\n");
+      {
+         printk("No DEC/Intel 21140/3 PCI network card found !!\n");
+         return 0;
+      }
    }
 #endif	
 #if defined(__PPC)
@@ -1170,8 +1173,7 @@ rtems_dec21140_driver_attach (struct rtems_bsdnet_ifconfig *config, int attach)
                                PCI_BASE_ADDRESS_1,
                                &lvalue);
 
-   tmp = (unsigned int)(lvalue & (unsigned int)(~MEM_MASK)) 
-      + (unsigned int)PCI_MEM_BASE;
+   tmp = (unsigned int)(lvalue & (unsigned int)(~MEM_MASK)) + (unsigned int)PCI_MEM_BASE;
 
    sc->base = (unsigned int *)(tmp);
 
@@ -1190,11 +1192,9 @@ rtems_dec21140_driver_attach (struct rtems_bsdnet_ifconfig *config, int attach)
 #if defined(__PPC)
    pci_write_config_word(pbus, pdev, pfun,
                          PCI_COMMAND,
-                         (unsigned16) ( PCI_COMMAND_MEMORY |
-                                        PCI_COMMAND_MASTER | 
-                                        PCI_COMMAND_INVALIDATE | 
-                                        PCI_COMMAND_WAIT |
-                                        PCI_COMMAND_FAST_BACK ) );
+                         (unsigned16) ( PCI_COMMAND_IO |
+                                        PCI_COMMAND_MEMORY |
+                                        PCI_COMMAND_MASTER ) );
 #endif
 #if defined(__i386__)
    pcib_conf_write16(signature, 0x04, ( 0x2 | 0x4 | 0x10 | 0x80 | 0x200) );

c/src/libchip/network/elnk.c

@@ -204,12 +204,12 @@ extern void Wait_X_ms( unsigned int timeToWait );
 #define rtems_bsp_delay_in_bus_cycles(cycle) Wait_X_ms( cycle/100 )
 #define CPU_CACHE_ALIGNMENT_FOR_BUFFER PG_SIZE
 
-inline void st_le32(volatile unsigned32 *addr, unsigned32 value)
+static inline void st_le32(volatile unsigned32 *addr, unsigned32 value)
 {
   *(addr)=value ;
 }
 
-inline unsigned32 ld_le32(volatile unsigned32 *addr)
+static inline unsigned32 ld_le32(volatile unsigned32 *addr)
 {
   return(*addr);
 }
@@ -2669,7 +2669,9 @@ elnk_init (void *arg)
          xl_miibus_writereg(sc, 0x18, MII_ANAR, ANAR_10 | ANAR_TX | ANAR_10_FD | ANAR_TX_FD );  /*  ANAR_T4 */
          xl_miibus_writereg(sc, 0x18, MII_BMCR, BMCR_STARTNEG | BMCR_AUTOEN );
 
-         while( ((sr = xl_miibus_readreg(sc, 0x18, MII_BMSR)) & BMSR_ACOMP) == 0 ); 
+
+         for (i=0; ((sr = xl_miibus_readreg(sc, 0x18, MII_BMSR)) & BMSR_ACOMP) == 0 && i < 20; i++) 
+            DELAY(10000);
       }
 
 
@@ -2997,7 +2999,7 @@ elnk_stats (struct elnk_softc *sc)
       printf("          interrupts:%-9d       txcmp_ints:%-5d  avg_chain_len:%-4d\n",
              sc->xl_stats.device_interrupts,
              sc->xl_stats.txcomplete_ints,
-             (totalLengths / numLengths) );
+             numLengths ? (totalLengths / numLengths) : -1 );
    }
 
    printf("        carrier_lost:%-5d             sqe_errs:%-5d\n",   
@@ -3120,8 +3122,6 @@ struct el_boards
       int pbus,pdev,pfun, vid, did, tindex;
 };
 
-
-
 /*
  * Attach an ELNK driver to the system
  */

c/src/libchip/network/if_fxp.c

@@ -182,8 +182,11 @@ static u_char fxp_cb_config_template[] = {
 struct fxp_ident {
 	u_int16_t	devid;
 	char 		*name;
+	int			warn;
 };
 
+#define UNTESTED 1
+
 /*
  * Claim various Intel PCI device identifiers for this driver.  The
  * sub-vendor and sub-device field are extensively used to identify
@@ -191,28 +194,20 @@ struct fxp_ident {
  * them.
  */
 static struct fxp_ident fxp_ident_table[] = {
-#ifdef NOTUSED
-	/* currently untested */
-    { 0x1229,		"Intel Pro 10/100B/100+ Ethernet" },
-    { 0x2449,		"Intel Pro/100 Ethernet" },
-#endif
-    { 0x1209,		"Intel Embedded 10/100 Ethernet" },
-#ifdef NOTUSED
-	/* currently untested */
-    { 0x1029,		"Intel Pro/100 Ethernet" },
-#endif
-    { 0x1030,		"Intel Pro/100 Ethernet" },
-#ifdef NOTUSED
-	/* currently untested */
-    { 0x1031,		"Intel Pro/100 Ethernet" },
-    { 0x1032,		"Intel Pro/100 Ethernet" },
-    { 0x1033,		"Intel Pro/100 Ethernet" },
-    { 0x1034,		"Intel Pro/100 Ethernet" },
-    { 0x1035,		"Intel Pro/100 Ethernet" },
-    { 0x1036,		"Intel Pro/100 Ethernet" },
-    { 0x1037,		"Intel Pro/100 Ethernet" },
-    { 0x1038,		"Intel Pro/100 Ethernet" },
-#endif
+    { 0x1229,		"Intel Pro 10/100B/100+ Ethernet", UNTESTED },
+    { 0x2449,		"Intel Pro/100 Ethernet", UNTESTED },
+    { 0x1209,		"Intel Embedded 10/100 Ethernet", 0 },
+    { 0x1029,		"Intel Pro/100 Ethernet", UNTESTED },
+    { 0x1030,		"Intel Pro/100 Ethernet", 0 },
+    { 0x1031,		"Intel Pro/100 Ethernet", UNTESTED },
+    { 0x1032,		"Intel Pro/100 Ethernet", UNTESTED },
+    { 0x1033,		"Intel Pro/100 Ethernet", UNTESTED },
+    { 0x1034,		"Intel Pro/100 Ethernet", UNTESTED },
+    { 0x1035,		"Intel Pro/100 Ethernet", UNTESTED },
+    { 0x1036,		"Intel Pro/100 Ethernet", UNTESTED },
+    { 0x1037,		"Intel Pro/100 Ethernet", UNTESTED },
+    { 0x1038,		"Intel Pro/100 Ethernet", UNTESTED },
+    { 0x103B,		"Intel Pro/100 Ethernet (82801BD PRO/100 VM (LOM))", 0 },
     { 0,		NULL },
 };
 
@@ -473,8 +468,13 @@ rtems_fxp_attach(struct rtems_bsdnet_ifconfig *config, int attaching)
 		DBGLVL_PRINTK(2,"fxp_attach: find_devid returned %d "
 		      "and pci signature 0x%x\n",
 		      i,sc->pci_signature);
-        if (PCIB_ERR_SUCCESS == i)
+        if (PCIB_ERR_SUCCESS == i) {
+			if ( UNTESTED == fxp_ident_table[j].warn ) {
+				device_printf(dev,"WARNING: this chip version has NOT been reported to work under RTEMS yet.\n");
+				device_printf(dev,"         If it works OK, report it as tested in 'c/src/libchip/network/if_fxp.c'\n");
+			}
 			break;
+		}
 	  }			
 	}
 
@@ -1681,13 +1681,17 @@ fxp_init(void *xsc)
 	struct fxp_cb_tx *txp;
 	int i, prm, s;
 
-rtems_task_wake_after(100);
 	DBGLVL_PRINTK(2,"fxp_init called\n");
 
 	s = splimp();
 	/*
 	 * Cancel any pending I/O
 	 */
+    /*
+     * Add line suggested by "Eugene Denisov" <dea@sendmail.ru>
+     * on Tue, 16 Mar 2004 13:10:15 +0300
+     */
+    sc->stat_ch = fxp_timeout_stopped;
 	fxp_stop(sc);
 
 	prm = (ifp->if_flags & IFF_PROMISC) ? 1 : 0;

c/src/libchip/rtc/Makefile.am

@@ -10,11 +10,12 @@ LIB = $(ARCH)/$(LIBNAME).a
 
 C_FILES = rtcprobe.c icm7170.c icm7170_reg.c icm7170_reg2.c icm7170_reg4.c \
     icm7170_reg8.c m48t08.c m48t08_reg.c m48t08_reg2.c m48t08_reg4.c \
-    m48t08_reg8.c
+    m48t08_reg8.c \
+    mc146818a.c mc146818a_ioreg.c
 
 OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 
-include_libchip_HEADERS = rtc.h icm7170.h m48t08.h
+include_libchip_HEADERS = rtc.h icm7170.h m48t08.h mc146818a.h
 
 include $(top_srcdir)/../../../automake/compile.am
 include $(top_srcdir)/../../../automake/lib.am

c/src/libchip/rtc/README.mc146818a

@@ -0,0 +1,14 @@
+#
+#  $Id$
+#
+
+The mc146818a driver supports:
+    Motorola
+        MC146818A
+        MC146818B
+    Dallas Semiconductor
+        DS12885
+        DS12887
+        DS1685
+        DS1687
+This is the Time-of-Day chip used in 'IBM-PC/AT compatible' machines.

c/src/libchip/rtc/mc146818a.c

@@ -0,0 +1,179 @@
+/*
+ *  This file interfaces with the real-time clock found in 
+ *  a Motorola MC146818A (common on PC hardware)
+ *
+ *  Year 2K Notes:
+ *
+ *  This chip only uses a two digit field to store the year.  This
+ *  code uses the RTEMS Epoch as a pivot year.  This lets us map the
+ *  two digit year field as follows:
+ *
+ *    + two digit years 0-87 are mapped to 2000-2087.
+ *    + two digit years 88-99 are mapped to 1988-1999.
+ *
+ *  This is less than the time span supported by RTEMS.
+ *
+ *  COPYRIGHT (c) 1989-1999.
+ *  On-Line Applications Research Corporation (OAR).
+ *
+ *  The license and distribution terms for this file may be
+ *  found in the file LICENSE in this distribution or at
+ *  http://www.rtems.com/license/LICENSE.
+ *
+ *  $Id$
+ */
+#include <rtems.h>
+#include <libchip/rtc.h>
+#include <libchip/mc146818a.h>
+#include <bsp.h>
+
+#define From_BCD( _x ) ((((_x) >> 4) * 10) + ((_x) & 0x0F))
+#define To_BCD( _x )   ((((_x) / 10) << 4) + ((_x) % 10))
+
+/*
+ * See if chip is present
+ */
+boolean mc146818a_probe(
+  int minor
+)
+{
+  unsigned32     mc146818a;
+  getRegister_f  getReg;
+  unsigned32     value;
+
+  /*
+   * Verify that chip is present and that time is valid
+   */
+  mc146818a = RTC_Table[ minor ].ulCtrlPort1;
+  getReg = RTC_Table[ minor ].getRegister;
+  value = (*getReg)( mc146818a, MC146818A_STATUSD );
+  if ((value == 0) || (value == 0xFF))
+    return FALSE;
+  return TRUE;
+}
+
+/*
+ * Initialize chip
+ */
+void mc146818a_initialize(
+  int minor
+)
+{
+  unsigned32     mc146818a;
+  getRegister_f  getReg;
+  setRegister_f  setReg;
+
+  mc146818a = RTC_Table[ minor ].ulCtrlPort1;
+  getReg = RTC_Table[ minor ].getRegister;
+  setReg = RTC_Table[ minor ].setRegister;
+
+  (*setReg)( mc146818a, MC146818A_STATUSA, MC146818ASA_DIVIDER|MC146818ASA_1024 );
+  (*setReg)( mc146818a, MC146818A_STATUSB, MC146818ASB_24HR );
+}
+
+/*
+ * Read time from chip
+ */
+int mc146818a_get_time(
+  int                minor,
+  rtems_time_of_day *time
+)
+{
+  unsigned32     mc146818a;
+  getRegister_f  getReg;
+  unsigned32     value;
+  rtems_interrupt_level level;
+
+  mc146818a = RTC_Table[ minor ].ulCtrlPort1;
+  getReg = RTC_Table[ minor ].getRegister;
+
+  /*
+   * No time if power failed
+   */
+  if (((*getReg)( mc146818a, MC146818A_STATUSD ) & MC146818ASD_PWR) == 0)
+    return -1;
+
+  /*
+   * Wait for time update to complete
+   */
+  rtems_interrupt_disable( level );
+  while (((*getReg)( mc146818a, MC146818A_STATUSA ) & MC146818ASA_TUP) != 0) {
+      rtems_interrupt_flash( level );
+  }
+  
+  /*
+   * Read the time (we have at least 244 usec to do this)
+   */
+  value = (*getReg)( mc146818a, MC146818A_YEAR );
+  value = From_BCD( value );
+  if ( value < 88 )
+    time->year = 2000 + value;
+  else
+    time->year = 1900 + value;
+
+  value = (*getReg)( mc146818a, MC146818A_MONTH );
+  time->month = From_BCD( value );
+
+  value = (*getReg)( mc146818a, MC146818A_DAY );
+  time->day = From_BCD( value );
+
+  value = (*getReg)( mc146818a, MC146818A_HRS );
+  time->hour = From_BCD( value );
+
+  value = (*getReg)( mc146818a, MC146818A_MIN );
+  time->minute = From_BCD( value );
+
+  value = (*getReg)( mc146818a, MC146818A_SEC );
+  rtems_interrupt_enable( level );
+  time->second = From_BCD( value );
+  time->ticks  = 0;
+
+  return 0;
+}
+
+/*
+ * Set time into chip
+ */
+int mc146818a_set_time(
+  int                minor,
+  rtems_time_of_day *time
+)
+{
+  unsigned32     mc146818a;
+  getRegister_f  getReg;
+  setRegister_f  setReg;
+
+  mc146818a = RTC_Table[ minor ].ulCtrlPort1;
+  getReg = RTC_Table[ minor ].getRegister;
+  setReg = RTC_Table[ minor ].setRegister;
+
+  /*
+   * Stop the RTC
+   */
+  (*setReg)( mc146818a, MC146818A_STATUSB, MC146818ASB_HALT|MC146818ASB_24HR );
+  
+  if ( time->year >= 2088 )
+    rtems_fatal_error_occurred( RTEMS_INVALID_NUMBER );
+
+  (*setReg)( mc146818a, MC146818A_YEAR,  To_BCD(time->year % 100) );
+  (*setReg)( mc146818a, MC146818A_MONTH, To_BCD(time->month) );
+  (*setReg)( mc146818a, MC146818A_DAY,   To_BCD(time->day) );
+  (*setReg)( mc146818a, MC146818A_HRS,   To_BCD(time->hour) );
+  (*setReg)( mc146818a, MC146818A_MIN,   To_BCD(time->minute) );
+  (*setReg)( mc146818a, MC146818A_SEC,   To_BCD(time->second) );
+ 
+  /*
+   * Restart the RTC
+   */
+  (*setReg)( mc146818a, MC146818A_STATUSB, MC146818ASB_24HR );
+  return 0;
+}
+
+/*
+ *  Driver function table
+ */
+rtc_fns mc146818a_fns = {
+  mc146818a_initialize,
+  mc146818a_get_time,
+  mc146818a_set_time
+};

c/src/libchip/rtc/mc146818a.h

@@ -0,0 +1,70 @@
+/*
+ *  This file contains the definitions for the following real-time clocks:
+ *
+ *    + Motorola MC146818A
+ *
+ *  COPYRIGHT (c) 1989-1999.
+ *  On-Line Applications Research Corporation (OAR).
+ *
+ *  The license and distribution terms for this file may be
+ *  found in the file LICENSE in this distribution or at
+ *  http://www.rtems.com/license/LICENSE.
+ *
+ *  $Id$
+ */
+
+#ifndef __LIBCHIP_MC146818A_h
+#define __LIBCHIP_MC146818A_h
+
+/*
+ *  Register addresses within chip
+ */
+#define MC146818A_SEC         0x00    /* seconds */
+#define MC146818A_SECALRM     0x01    /* seconds alarm */
+#define MC146818A_MIN         0x02    /* minutes */
+#define MC146818A_MINALRM     0x03    /* minutes alarm */
+#define MC146818A_HRS         0x04    /* hours */
+#define MC146818A_HRSALRM     0x05    /* hours alarm */
+#define MC146818A_WDAY        0x06    /* week day */
+#define MC146818A_DAY         0x07    /* day of month */
+#define MC146818A_MONTH       0x08    /* month of year */
+#define MC146818A_YEAR        0x09    /* month of year */
+
+#define MC146818A_STATUSA     0x0a    /* status register A */
+#define  MC146818ASA_TUP       0x80   /* time update in progress */
+#define  MC146818ASA_DIVIDER   0x20   /* divider for 32768 crystal */
+#define  MC146818ASA_1024      0x06   /* divide to 1024 Hz */
+
+#define MC146818A_STATUSB     0x0b    /* status register B */
+#define  MC146818ASB_DST       0x01   /* Daylight Savings Time */
+#define  MC146818ASB_24HR      0x02   /* 0 = 12 hours, 1 = 24 hours */
+#define  MC146818ASB_HALT      0x80   /* stop clock updates */
+
+#define MC146818A_STATUSD     0x0d    /* status register D */
+#define  MC146818ASD_PWR       0x80   /* clock lost power */
+
+ 
+/*
+ *  Driver function table
+ */
+extern rtc_fns mc146818a_fns;
+boolean mc146818a_probe(
+  int minor
+);
+
+/*
+ * Default register access routines
+ */
+unsigned32 mc146818a_get_register(
+  unsigned32  ulCtrlPort,
+  unsigned8   ucRegNum
+);
+
+void  mc146818a_set_register(
+  unsigned32  ulCtrlPort,
+  unsigned8   ucRegNum,
+  unsigned32  ucData
+);
+
+#endif
+/* end of include file */

c/src/libchip/rtc/mc146818a_ioreg.c

@@ -0,0 +1,45 @@
+/*
+ *  This file contains a typical set of register access routines which may be
+ *  used with the MC146818A chip if accesses to the chip are as follows:
+ *
+ *    + registers are in I/O space
+ *    + registers are accessed as bytes
+ *    + registers are only byte-aligned (no address gaps)
+ *
+ *  COPYRIGHT (c) 1989-1997.
+ *  On-Line Applications Research Corporation (OAR).
+ *
+ *  The license and distribution terms for this file may be
+ *  found in the file LICENSE in this distribution or at
+ *  http://www.rtems.com/license/LICENSE.
+ *
+ *  $Id$
+ */
+
+#include <rtems.h>
+#include <bsp.h>
+
+unsigned32 mc146818a_get_register(
+  unsigned32  ulCtrlPort,
+  unsigned8   ucRegNum
+)
+{
+  unsigned8   val;
+  unsigned8   tmp;
+
+  outport_byte( ulCtrlPort, ucRegNum );
+  inport_byte( 0x84, tmp );   /* Hack a delay to give chip time to settle */
+  inport_byte( ulCtrlPort+1, val );
+  inport_byte( 0x84, tmp );   /* Hack a delay to give chip time to settle */
+  return val;
+}
+
+void  mc146818a_set_register(
+  unsigned32  ulCtrlPort,
+  unsigned8   ucRegNum,
+  unsigned32  ucData
+)
+{
+  outport_byte( ulCtrlPort, ucRegNum );
+  outport_byte( ulCtrlPort+1, (unsigned8)ucData );
+}

c/src/libchip/rtc/rtc.h

@@ -32,7 +32,9 @@ typedef struct _rtc_fns {
 typedef enum {
   RTC_M48T08,                  /* SGS-Thomsom M48T08 or M48T18 */
   RTC_ICM7170,                 /* Harris ICM-7170 */
-  RTC_CUSTOM                   /* BSP specific driver */
+  RTC_CUSTOM,                  /* BSP specific driver */
+  RTC_MC146818A                /* Motorola MC146818A */
+
 } rtc_devs;
 
 /*

c/src/tests/support/include/.cvsignore

@@ -1,2 +0,0 @@
-Makefile
-Makefile.in

config-ml.in

@@ -627,11 +627,11 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
       exit 1
     fi
 
-    cd ${ML_POPDIR}
+    cd "${ML_POPDIR}"
 
   done
 
-  cd ${ml_origdir}
+  cd "${ml_origdir}"
 fi
 
 fi # ${ml_toplevel_p} = yes

cpukit/ChangeLog

@@ -1,3 +1,29 @@
+2004-10-18	Joel Sherrill <joel@OARcorp.com>
+
+	* aclocal/version.m4: Updated to rtems-4.6.2.
+
+2004-10-18	Joel Sherrill <joel@OARcorp.com>
+
+	* aclocal/version.m4: Updated to rtems-4.6.2.
+
+2004-10-18	Joel Sherrill <joel@OARcorp.com>
+
+	* aclocal/version.m4: Updated to rtems-4.6.2.
+
+2004-08-18	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* aclocal/canonical-host.m4, aclocal/canonical-target-name.m4,
+	aclocal/canonicalize-tools.m4, aclocal/check-cpu.m4,
+	aclocal/check-itron.m4, aclocal/check-multiprocessing.m4,
+	aclocal/check-networking.m4, aclocal/check-newlib.m4,
+	aclocal/check-posix.m4, aclocal/check-tool.m4, aclocal/enable-bare.m4,
+	aclocal/enable-inlines.m4, aclocal/enable-itron.m4,
+	aclocal/enable-multiprocessing.m4, aclocal/enable-networking.m4,
+	aclocal/enable-posix.m4, aclocal/env-rtemscpu.m4,
+	aclocal/gcc-isystem.m4, aclocal/gcc-pipe.m4, aclocal/multi.m4,
+	aclocal/multilib.m4, aclocal/prog-cc.m4, aclocal/rtems-debug.m4,
+	aclocal/rtems-top.m4, aclocal/sysv-ipc.m4: Fix m4-underquoting.
+
 2004-04-08	Joel Sherrill <joel@OARcorp.com>
 
 	* aclocal/version.m4: Updated to rtems-4.6.1.

cpukit/aclocal/canonical-host.m4

@@ -1,6 +1,6 @@
 dnl $Id$
 
-AC_DEFUN(RTEMS_CANONICAL_HOST,
+AC_DEFUN([RTEMS_CANONICAL_HOST],
 [dnl
 AC_REQUIRE([AC_CANONICAL_HOST])
 RTEMS_HOST=$host_os

cpukit/aclocal/canonical-target-name.m4

@@ -8,7 +8,7 @@ dnl target naming conventions "processor-vendor-os"
 dnl Therefore autoconf's AC_CANONICAL_TARGET will fail for them
 dnl and we have to fix it for rtems ourselves 
 
-AC_DEFUN(RTEMS_CANONICAL_TARGET_CPU,
+AC_DEFUN([RTEMS_CANONICAL_TARGET_CPU],
 [
 AC_CANONICAL_TARGET
 AC_MSG_CHECKING(rtems target cpu)

cpukit/aclocal/canonicalize-tools.m4

@@ -4,7 +4,7 @@ dnl
 dnl Set target tools
 dnl
 
-AC_DEFUN(RTEMS_CANONICALIZE_TOOLS,
+AC_DEFUN([RTEMS_CANONICALIZE_TOOLS],
 [AC_REQUIRE([RTEMS_PROG_CC])dnl
 
 dnl FIXME: What shall be done if these tools are not available?

cpukit/aclocal/check-cpu.m4

@@ -1,7 +1,7 @@
 dnl $Id$
 
 dnl check if RTEMS support a cpu
-AC_DEFUN(RTEMS_CHECK_CPU,
+AC_DEFUN([RTEMS_CHECK_CPU],
 [dnl
 AC_REQUIRE([RTEMS_TOP])
 AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU])

cpukit/aclocal/check-itron.m4

@@ -1,6 +1,6 @@
 dnl $Id$
 dnl
-AC_DEFUN(RTEMS_CHECK_ITRON_API,
+AC_DEFUN([RTEMS_CHECK_ITRON_API],
 [dnl
 AC_REQUIRE([RTEMS_CHECK_CPU])dnl
 AC_REQUIRE([RTEMS_ENABLE_ITRON])dnl
@@ -28,7 +28,7 @@ fi
 AC_SUBST(HAS_ITRON_API)dnl
 ])
 
-AC_DEFUN(RTEMS_DEFINE_ITRON_API,
+AC_DEFUN([RTEMS_DEFINE_ITRON_API],
 [AC_REQUIRE([RTEMS_CHECK_ITRON_API])dnl
 if test x"${HAS_ITRON_API}" = x"yes";
 then

cpukit/aclocal/check-multiprocessing.m4

@@ -2,7 +2,7 @@ dnl
 dnl $Id$
 dnl
 
-AC_DEFUN(RTEMS_CHECK_MULTIPROCESSING,
+AC_DEFUN([RTEMS_CHECK_MULTIPROCESSING],
 [dnl
 AC_REQUIRE([RTEMS_ENV_RTEMSCPU])dnl
 AC_REQUIRE([RTEMS_CHECK_CPU])dnl
@@ -13,7 +13,7 @@ AS_IF([test "$enable_multiprocessing" = "yes"],
   [HAS_MP="no"])
 ])
 
-AC_DEFUN(RTEMS_DEFINE_MULTIPROCESSING,
+AC_DEFUN([RTEMS_DEFINE_MULTIPROCESSING],
 [AC_REQUIRE([RTEMS_CHECK_MULTIPROCESSING])dnl
 if test x"${HAS_MP}" = x"yes";
 then

cpukit/aclocal/check-networking.m4

@@ -1,6 +1,6 @@
 dnl $Id$
 dnl
-AC_DEFUN(RTEMS_CHECK_NETWORKING,
+AC_DEFUN([RTEMS_CHECK_NETWORKING],
 [dnl
 AC_REQUIRE([RTEMS_CHECK_CPU])dnl
 AC_REQUIRE([RTEMS_ENABLE_NETWORKING])dnl

cpukit/aclocal/check-newlib.m4

@@ -1,6 +1,6 @@
 dnl $Id$
 
-AC_DEFUN(RTEMS_CHECK_NEWLIB,
+AC_DEFUN([RTEMS_CHECK_NEWLIB],
 [dnl
 AC_REQUIRE([RTEMS_PROG_CC_FOR_TARGET])dnl
 AC_REQUIRE([RTEMS_CANONICALIZE_TOOLS])dnl

cpukit/aclocal/check-posix.m4

@@ -1,6 +1,6 @@
 dnl $Id$
 dnl
-AC_DEFUN(RTEMS_CHECK_POSIX_API,
+AC_DEFUN([RTEMS_CHECK_POSIX_API],
 [dnl
 AC_REQUIRE([RTEMS_CHECK_CPU])dnl
 AC_REQUIRE([RTEMS_ENABLE_POSIX])dnl
@@ -28,7 +28,7 @@ fi
 AC_SUBST(HAS_POSIX_API)dnl
 ])
 
-AC_DEFUN(RTEMS_DEFINE_POSIX_API,
+AC_DEFUN([RTEMS_DEFINE_POSIX_API],
 [AC_REQUIRE([RTEMS_CHECK_POSIX_API])dnl
 AS_IF(
   [test x"${HAS_POSIX_API}" = x"yes"],

cpukit/aclocal/check-tool.m4

@@ -3,7 +3,7 @@ dnl $Id$
 ## Check for a cross tool, similar to AC_CHECK_TOOL, but do not fall back to
 ## the un-prefixed version of PROG-TO-CHECK-FOR.
 dnl RTEMS_CHECK_TOOL(VARIABLE, PROG-TO-CHECK-FOR[, VALUE-IF-NOT-FOUND [, PATH]])
-AC_DEFUN(RTEMS_CHECK_TOOL,
+AC_DEFUN([RTEMS_CHECK_TOOL],
 [
   AS_IF([test "x$build_alias" != "x$host_alias"],
     [rtems_tool_prefix=${ac_tool_prefix}])

cpukit/aclocal/enable-bare.m4

@@ -1,4 +1,4 @@
-AC_DEFUN(RTEMS_ENABLE_BARE,
+AC_DEFUN([RTEMS_ENABLE_BARE],
 [
 AC_ARG_ENABLE(bare-cpu-cflags,
 AC_HELP_STRING([--enable-bare-cpu-cflags],[specify a particular cpu cflag (bare bsp specific)]),

cpukit/aclocal/enable-inlines.m4

@@ -1,6 +1,6 @@
 dnl $Id$
 
-AC_DEFUN(RTEMS_ENABLE_INLINES,
+AC_DEFUN([RTEMS_ENABLE_INLINES],
 [AC_ARG_ENABLE(rtems-inlines,
 AC_HELP_STRING([--enable-rtems-inlines],[enable RTEMS inline functions (default:enabled, disable to use macros)]),
 [case "${enableval}" in

cpukit/aclocal/enable-itron.m4

@@ -1,6 +1,6 @@
 dnl $Id$
 
-AC_DEFUN(RTEMS_ENABLE_ITRON,
+AC_DEFUN([RTEMS_ENABLE_ITRON],
 [
 ## AC_BEFORE([$0], [RTEMS_CHECK_ITRON_API])dnl
 

cpukit/aclocal/enable-multiprocessing.m4

@@ -1,6 +1,6 @@
 dnl $Id$
 
-AC_DEFUN(RTEMS_ENABLE_MULTIPROCESSING,
+AC_DEFUN([RTEMS_ENABLE_MULTIPROCESSING],
 [
 AC_ARG_ENABLE(multiprocessing,
 AC_HELP_STRING([--enable-multiprocessing],[enable multiprocessing interface]),

cpukit/aclocal/enable-networking.m4

@@ -1,6 +1,6 @@
 dnl $Id$
 
-AC_DEFUN(RTEMS_ENABLE_NETWORKING,
+AC_DEFUN([RTEMS_ENABLE_NETWORKING],
 [
 ## AC_BEFORE([$0], [RTEMS_CHECK_NETWORKING])dnl